Re: [OT] complex GIT merging

[wjw]

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. Munging git around to do what you want seems like an awful lot of work and at least some minimal risk. Were I you, I would rather work on the project itself than on patching things together in git. But that is just me. I guess it would depend on the ROI expected.

You probably already know this, but I would certainly standardize on one system of version control. As long as you have a git server set up, it seems to me like that is the way to go. I worked for a time at a large insurance company where the developers were using svn, the test team cvs, and the other groups up the RUP ladder were using Harvest. Not a good situation, particularly since it was a huge project and a huge team. We finally got it down to svn and Harvest (Harvest had upper management behind it). I ended up writing the bridge between svn and Harvest. It would have been so much better had we simple been able to rely on a single system!

Anyway, anecdotes aside, I thought I would toss in my $0.02 worth. While it would be great to go through the exercise and learn more about git, I would ask the ROI question.

Best of luck with your project!

[LanX]

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! :)