Small git help in working on Gotham - Printable Version +- Kodi Community Forum (https://forum.kodi.tv) +-- Forum: Development (https://forum.kodi.tv/forumdisplay.php?fid=32) +--- Forum: Kodi Application (https://forum.kodi.tv/forumdisplay.php?fid=93) +--- Thread: Small git help in working on Gotham (/showthread.php?tid=193407) |
Small git help in working on Gotham - voguemaster - 2014-04-28 Hi all, As I'm relatively new to git I'm having a bit of a trouble. When I forked XBMC on github there was no Gotham branch. It's been a while since I updated my working tree so I did: git fetch upstream git merge upstream/master Which of course landed me XBMC version 14.0 alpha :-). I want to make a small, rather trivial, fix in gotham but my origin has no branch called Gotham and I have no clue how to merge it. I searched around and found some answers in StackOverflow but they didn't work for me and ultimately I had to git revert everything... My git branch -r output it: origin/Dharma origin/Eden origin/Eden-ATV2-iOS5 origin/Frodo origin/Frodo-ATV2-iOS6 origin/HEAD -> origin/master origin/extend_duration_real_streams origin/m3u_fix_deleting_url_string origin/master origin/only_allow_extend_duration_real_streams origin/windowing upstream/Dharma upstream/Eden upstream/Eden-ATV2-iOS5 upstream/Frodo upstream/Frodo-ATV2-iOS6 upstream/Gotham upstream/master upstream/windowing Can someone explain what I need to do in order to work on Gotham? Any help is appreciated! RE: Small git help in working on Gotham - ironic_monkey - 2014-04-28 1) create local branch 'Gotham' originating from upstream Gotham branch: git checkout -b Gotham upstream/Gotham 2) commit your shit git commit -a -m "Shit" 3) push branch to your remote git push origin Gotham RE: Small git help in working on Gotham - voguemaster - 2014-04-28 Ok, i'll try that. I tried the following commands just now: $ git checkout Gotham checking out files... Switched to Gotham $ git pull upstream Gotham ...up to date.. Does that mean my current working tree is synced with Gotham version of all files? I'm guessing that doesn't help me and I need to do the procedure you just wrote? Edit - thanks for the help, I managed it :-) RE: Small git help in working on Gotham - davilla - 2014-04-30 'git pull --rebase' is your friend too. |