Pages

8.24.2013

And this is where GitHub fails...

I need to merge some old code that has been lying around on a branch for around six months. I fear using git merge will make me lose important stuff. So, I created a testMergeBranch to test and lost a lot of things.
This is what a git diff branch branch gives me...

What does that even mean? Anyway... one of my colleagues suggested going old school, and it turns out, old school is good.

  1. Downloaded BeyondCompare.
  2. Copied both branches onto a TestMergeFolder.
  3. Made it happen!


and this is where GitHub fails.
Posted by at
Labels:

1 comment:

  1. UnknownAugust 27, 2013 at 4:43 PM

    You should have rebased the branch before trying to merge it. Also would be useful to see the actual merge commands instead of just the results. Git/Github has never failed me and i handle all the release lifecycle at my company

    ReplyDelete

Subscribe to: Post Comments (Atom)