[git-users] Freeze a branch

2012-03-11 Thread Mark Liversedge
Hi, I have a branch on github that was used for development for the last 18 months, but it has now been merged back into master. I will be removing it shortly, but am keeping it just in case anything odd crops up, or folks have local versions they are working against and submit a patch in the

Re: [git-users] git pull origin branch

2011-08-22 Thread Mark Liversedge
Thank you everyone. I will keep doing the same. I tried rebasing and had a few issues (merge conflicts!). Mark -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit

[git-users] git pull origin branch

2011-08-21 Thread Mark Liversedge
Hi, Dumb question. I'm working on a branch locally that is also over at github. I fetch the latest from github with: Make sure I'm clean $ git checkout branch $ git reset --hard origin/branch $ git pull origin branch Make changes and commit then $ git push origin branch But when I pull other

[git-users] fetch merge but ignoring some patches?

2011-07-23 Thread Mark Liversedge
Hi, I have two branches for a v2 and v3 of software. The v2 codebase is similar to v3 and when I apply to v2 I fetch into v3 and merge, fixing the differences. However, recently there have been a few 'radical' patches applied to v2 which I do not want to apply in v3, but a lot of other stuff

[git-users] Re: fetch merge but ignoring some patches?

2011-07-23 Thread Mark Liversedge
Aha! I always wondered what cherry-pick was for. Just did that and it worked nicely. I didn't want to merge and revert because I would have spent hours unpicking a huge patch only to revert it. Thanks for the tip. -- You received this message because you are subscribed to the Google Groups

[git-users] git reset --hard branch

2011-02-23 Thread Mark Liversedge
Hi, If this is easy peasy then my apologies. is it possible to reset a tracking branch to its origin without affecting other local branches? i.e. $ git checkout mybranch $ git reset --hard origin mybranch ? Thanks for any help, Mark -- You received this message because you are subscribed to