Re: [Kicad-developers] Git noob question

2018-03-12 21:02 GMT+01:00 Kevin Cozens : > On 2018-03-11 11:52 AM, Nick Østergaard wrote: > >> That sounds a bit risky. Using the stash and popping can make you lose >> your local changes if you decide to abort a potential merge conflict. IIRC. >> Commiting changes are generally

Re: [Kicad-developers] Git noob question

On 2018-03-11 11:52 AM, Nick Østergaard wrote: That sounds a bit risky. Using the stash and popping can make you lose your local changes if you decide to abort a potential merge conflict. IIRC. Commiting changes are generally safer. Or you could use git stash apply instead. The risk of lose

Re: [Kicad-developers] Git noob question

Den 10. mar. 2018 23.36 skrev "Kevin Cozens" : On 2018-03-03 03:50 PM, Maciej Suminski wrote: > If we are speaking about git tips - I think 'git pull --rebase' is even > simpler in this case. > I have a script I call "gitpull" that does that but it also does a "git stash"

Re: [Kicad-developers] Git noob question

On 2018-03-03 03:50 PM, Maciej Suminski wrote: If we are speaking about git tips - I think 'git pull --rebase' is even simpler in this case. I have a script I call "gitpull" that does that but it also does a "git stash" before the pull and a "git stash pop" after the pull. -- Cheers!

Re: [Kicad-developers] Git noob question

With the shorter notation with -r for --rebase 2018-03-03 21:50 GMT+01:00 Maciej Suminski : > [...] git pull would do a fetch and merge together, but you want to fetch >> and rebase -- you can set your .gitconfig to do the fetch and rebase, but I >> think it's easier to

Re: [Kicad-developers] Git noob question

[...] git pull would do a fetch and merge together, but you want to fetch and rebase -- you can set your .gitconfig to do the fetch and rebase, but I think it's easier to follow along with what's going on if you do the fetch separately and check the tree each time with git hist. If we are

Re: [Kicad-developers] Git noob question

On 2018-03-02 03:28 PM, Jeff Young wrote: Before I go and make a hash of everything, can someone please validate the following. I have a bunch of 6.0 work on my master. I have a 5.0stable branch that I use for 5.0. If I want to push changes for RC2, I’d do: git push origin

Re: [Kicad-developers] Git noob question

Cool stuff; thanks for those. I’m finding the —graph option particularly useful. Cheers, Jeff. > On 3 Mar 2018, at 01:40, Tiger12506 wrote: > > I'm not a kicad dev, just an avid reader of the list, but I am pretty fluent > in git. > Here are some aliases that you

Re: [Kicad-developers] Git noob question

I'm not a kicad dev, just an avid reader of the list, but I am pretty fluent in git. Here are some aliases that you might find useful (that go in your ~/.gitconfig) [alias]     co = checkout     ci = commit     st = status     br = branch     hist = log --all --abbrev-commit --graph

Re: [Kicad-developers] Git noob question

This depends on which remote your local repo is linked to. I keep two completely separate repos. One directly linked to the main kicad repo. I use this one for patch merges and very minor changes. The result of `git remote -v` for this repo looks like this: origin

Re: [Kicad-developers] Git noob question

OK, I followed Seth’s recipe so I’m now “right-side-up”. (5.0 on master; 6.0 on a branch) But I still don’t want to do a general push (as that will copy all my branches), right? So I do a: git push origin master right? Next question, when it asks for my launchpad username, what’s it

Re: [Kicad-developers] Git noob question

Jeff, Please remember no v6 stuff until the stable 5 version is released and branched. If you muck it up, I can always overwrite it with the last valid commit. Cheers, Wayne On 03/02/2018 04:03 PM, Seth Hillbrand wrote: Jeff- As a fellow refuge from centralized VCSs, I sympathize.  It

Re: [Kicad-developers] Git noob question

Jeff- As a fellow refuge from centralized VCSs, I sympathize. It took me a while to learn to love git branch but it is your friend. Here's a quick way to get into the layout Wayne was recommending: git checkout master (you are now in your branch that has all the V6 stuff) git checkout -b

Re: [Kicad-developers] Git noob question

(to make this last point easier, you can configure git to automatically rebase when you do `git pull` : https://stevenharman.net/git-pull-with-automatic-rebase ) On Fri, Mar 2, 2018 at 3:46 PM, Wayne Stambaugh wrote: > Jeff, > > On 03/02/2018 03:28 PM, Jeff Young wrote: >

Re: [Kicad-developers] Git noob question

Jeff, On 03/02/2018 03:28 PM, Jeff Young wrote: Before I go and make a hash of everything, can someone please validate the following. I have a bunch of 6.0 work on my master. Making changes to master is risky unless you doing a simple bug fix but even then I work in a separate branch then

[Kicad-developers] Git noob question

Before I go and make a hash of everything, can someone please validate the following. I have a bunch of 6.0 work on my master. I have a 5.0stable branch that I use for 5.0. If I want to push changes for RC2, I’d do: git push origin 5.0stable:master Is that right? Thanks,