Beefy Boxes and Bandwidth Generously Provided by pair Networks
P is for Practical
 
PerlMonks  

Re^2: [OT] complex GIT merging

by LanX (Saint)
on Sep 27, 2018 at 16:05 UTC ( [id://1223167]=note: print w/replies, xml ) Need Help??


in reply to Re: [OT] complex GIT merging
in thread [OT] complex GIT merging

Thanks, everybody.

I dared asking that question because I didn't want to miss any obvious solution

> Honestly, I would simply make a new branch, put my stuff there and leave it. I assume that your current local copy has been pulled and is recent.

I decided to go this way, and pushed a branch to gitlab.

Not only because it's already a difficult task under normal circumstances, but because the commit history is a big mess on our server.

Two colleagues did irregular big commits of all changed files (unfortunately including mine) with commit messages like "status" ,"new status", "last status".

Probably I could ditch those, but it would be a waste of time trying to discuss with them. It's already difficult enough to keep my own house clean.

Again thanks everybody! :)

Cheers Rolf
(addicted to the Perl Programming Language :)
Wikisyntax for the Monastery FootballPerl is like chess, only without the dice

Log In?
Username:
Password:

What's my password?
Create A New User
Domain Nodelet?
Node Status?
node history
Node Type: note [id://1223167]
help
Chatterbox?
and the web crawler heard nothing...

How do I use this?Last hourOther CB clients
Other Users?
Others scrutinizing the Monastery: (5)
As of 2024-03-29 08:51 GMT
Sections?
Information?
Find Nodes?
Leftovers?
    Voting Booth?

    No recent polls found