Re: Still confused by git
Hi Harbs, Check the wiki first for a complete workflow guideline and git setup, if you need more info, ask them after you reviewed this wiki pages [1] [2], there are even interactive tutorials really well done. [1] [2] I advice that to everybody, for myself, until everyone understood and applied the basics written in the wiki, I won't touch the SDK anymore. -Fred [1] https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide [2] https://cwiki.apache.org/confluence/display/FLEX/Good+vs+Bad+Git+usage -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 10:14 AM To: dev@flex.apache.org Subject: Still confused by git I've tried to follow all the git discussions. But, after all the discussions on how to use git, I'm still confused on the basics. Here's what I need to know right now: Right now I have a number of files I've edited outside my working directory related to ColorPicker inside experimental. I'd like to commit this work to the develop branch. It probably makes sense to create a branch to indicate the work I'm doing on this. (or not?) I'm using SourceTree on Mac. I'd rather not mess with the command line. So far I've checked out develop and master. The index view shows a bunch of modified and deleted files. I have not yet touched any of the git folders on my machine. How do I? 1) Make sure my working copy is up to date? 2) Make sure my working coy is the correct branch? (Does that make sense?) 3) Create a new branch? (Or do I?) 4) Get my changes up to origin? I've seen a lot of talk about switching between branches, but this stuff is all very fuzzy to me and kind of scary… ;-) Harbs
Re: Still confused by git
Hi Fred, I've read those pages. (I see now you've updated them.) Conceptually, I sort of got the idea of how to do things, but I find that until I actually do something once, I don't quite get it… If someone could walk me through this once, I think I'l be a lot more comfortable that I'm doing things right. There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. Looking at the graph, it seems to me that not everyone is working exactly the same way. (unless I don't know how to read the graph, which is also possible…) On Apr 5, 2013, at 11:29 AM, Frédéric THOMAS wrote: Hi Harbs, Check the wiki first for a complete workflow guideline and git setup, if you need more info, ask them after you reviewed this wiki pages [1] [2], there are even interactive tutorials really well done. [1] [2] I advice that to everybody, for myself, until everyone understood and applied the basics written in the wiki, I won't touch the SDK anymore. -Fred [1] https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide [2] https://cwiki.apache.org/confluence/display/FLEX/Good+vs+Bad+Git+usage -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 10:14 AM To: dev@flex.apache.org Subject: Still confused by git I've tried to follow all the git discussions. But, after all the discussions on how to use git, I'm still confused on the basics. Here's what I need to know right now: Right now I have a number of files I've edited outside my working directory related to ColorPicker inside experimental. I'd like to commit this work to the develop branch. It probably makes sense to create a branch to indicate the work I'm doing on this. (or not?) I'm using SourceTree on Mac. I'd rather not mess with the command line. So far I've checked out develop and master. The index view shows a bunch of modified and deleted files. I have not yet touched any of the git folders on my machine. How do I? 1) Make sure my working copy is up to date? 2) Make sure my working coy is the correct branch? (Does that make sense?) 3) Create a new branch? (Or do I?) 4) Get my changes up to origin? I've seen a lot of talk about switching between branches, but this stuff is all very fuzzy to me and kind of scary… ;-) Harbs
Re: Still confused by git
You right Harbs, that currently looks something I dislike at the point I won't work anymore on that tree. Well, for your case (I assume you updated your .gitconfig as shown in the Wiki) : -Checkout the develop branch: git co develop -If you have some modified files in your working tree, save them first: git stash -u my current work -Be sure the branch is up to date before to start working on it: git pull --rebase -create the branch you will work on, assuming your create a JIRA first: git co -b FLEX- -get back the work you save on this branch: git stash pop -Edit/add files/dirs -Add them to the staged area(also called index) and commit, you've got 2 choices, either you do 1 commit or more: 1- To add all of them in a once, that's in order to do only one commit: - git add . - git ci -m FLEX-: Fixed this 2- To add them one by one, that's in order to make more commits - git add myFile1 myFile2 - git ci -m FLEX-: Fixed this in my 1rst commit - git add myFile3 myFile4 - git ci -m FLEX-: Fixed this in my 2nd commit - check all the files are committed: git st - If there are more repeat the add/commit steps, otherwise, go back on the develop branch: git co develop - rebase your work on what the others did: git pull --rebase - Merge your branch to the develop one: git merge --no-ff FLEX- - you can now push: git push - you can remove your local branch if you want now it is unused: git br -d FLEX- I hope that helps -Fred -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 11:06 AM To: dev@flex.apache.org Subject: Re: Still confused by git Hi Fred, I've read those pages. (I see now you've updated them.) Conceptually, I sort of got the idea of how to do things, but I find that until I actually do something once, I don't quite get it… If someone could walk me through this once, I think I'l be a lot more comfortable that I'm doing things right. There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. Looking at the graph, it seems to me that not everyone is working exactly the same way. (unless I don't know how to read the graph, which is also possible…) On Apr 5, 2013, at 11:29 AM, Frédéric THOMAS wrote: Hi Harbs, Check the wiki first for a complete workflow guideline and git setup, if you need more info, ask them after you reviewed this wiki pages [1] [2], there are even interactive tutorials really well done. [1] [2] I advice that to everybody, for myself, until everyone understood and applied the basics written in the wiki, I won't touch the SDK anymore. -Fred [1] https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide [2] https://cwiki.apache.org/confluence/display/FLEX/Good+vs+Bad+Git+usage -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 10:14 AM To: dev@flex.apache.org Subject: Still confused by git I've tried to follow all the git discussions. But, after all the discussions on how to use git, I'm still confused on the basics. Here's what I need to know right now: Right now I have a number of files I've edited outside my working directory related to ColorPicker inside experimental. I'd like to commit this work to the develop branch. It probably makes sense to create a branch to indicate the work I'm doing on this. (or not?) I'm using SourceTree on Mac. I'd rather not mess with the command line. So far I've checked out develop and master. The index view shows a bunch of modified and deleted files. I have not yet touched any of the git folders on my machine. How do I? 1) Make sure my working copy is up to date? 2) Make sure my working coy is the correct branch? (Does that make sense?) 3) Create a new branch? (Or do I?) 4) Get my changes up to origin? I've seen a lot of talk about switching between branches, but this stuff is all very fuzzy to me and kind of scary… ;-) Harbs
Re: Still confused by git
oops, reverse the 2 furst steps: -If you have some modified files in your working tree, save them first: git stash -u my current work -Checkout the develop branch: git co develop -Fred -Message d'origine- From: Frédéric THOMAS Sent: Friday, April 05, 2013 11:31 AM To: dev@flex.apache.org Subject: Re: Still confused by git You right Harbs, that currently looks something I dislike at the point I won't work anymore on that tree. Well, for your case (I assume you updated your .gitconfig as shown in the Wiki) : -If you have some modified files in your working tree, save them first: git stash -u my current work -Be sure the branch is up to date before to start working on it: git pull --rebase -create the branch you will work on, assuming your create a JIRA first: git co -b FLEX- -get back the work you save on this branch: git stash pop -Edit/add files/dirs -Add them to the staged area(also called index) and commit, you've got 2 choices, either you do 1 commit or more: 1- To add all of them in a once, that's in order to do only one commit: - git add . - git ci -m FLEX-: Fixed this 2- To add them one by one, that's in order to make more commits - git add myFile1 myFile2 - git ci -m FLEX-: Fixed this in my 1rst commit - git add myFile3 myFile4 - git ci -m FLEX-: Fixed this in my 2nd commit - check all the files are committed: git st - If there are more repeat the add/commit steps, otherwise, go back on the develop branch: git co develop - rebase your work on what the others did: git pull --rebase - Merge your branch to the develop one: git merge --no-ff FLEX- - you can now push: git push - you can remove your local branch if you want now it is unused: git br -d FLEX- I hope that helps -Fred -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 11:06 AM To: dev@flex.apache.org Subject: Re: Still confused by git Hi Fred, I've read those pages. (I see now you've updated them.) Conceptually, I sort of got the idea of how to do things, but I find that until I actually do something once, I don't quite get it… If someone could walk me through this once, I think I'l be a lot more comfortable that I'm doing things right. There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. Looking at the graph, it seems to me that not everyone is working exactly the same way. (unless I don't know how to read the graph, which is also possible…) On Apr 5, 2013, at 11:29 AM, Frédéric THOMAS wrote: Hi Harbs, Check the wiki first for a complete workflow guideline and git setup, if you need more info, ask them after you reviewed this wiki pages [1] [2], there are even interactive tutorials really well done. [1] [2] I advice that to everybody, for myself, until everyone understood and applied the basics written in the wiki, I won't touch the SDK anymore. -Fred [1] https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide [2] https://cwiki.apache.org/confluence/display/FLEX/Good+vs+Bad+Git+usage -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 10:14 AM To: dev@flex.apache.org Subject: Still confused by git I've tried to follow all the git discussions. But, after all the discussions on how to use git, I'm still confused on the basics. Here's what I need to know right now: Right now I have a number of files I've edited outside my working directory related to ColorPicker inside experimental. I'd like to commit this work to the develop branch. It probably makes sense to create a branch to indicate the work I'm doing on this. (or not?) I'm using SourceTree on Mac. I'd rather not mess with the command line. So far I've checked out develop and master. The index view shows a bunch of modified and deleted files. I have not yet touched any of the git folders on my machine. How do I? 1) Make sure my working copy is up to date? 2) Make sure my working coy is the correct branch? (Does that make sense?) 3) Create a new branch? (Or do I?) 4) Get my changes up to origin? I've seen a lot of talk about switching between branches, but this stuff is all very fuzzy to me and kind of scary… ;-) Harbs
Re: Still confused by git
git: 'st' is not a git command. See 'git --help'. Did you mean one of these? status reset stage stash svn On Apr 5, 2013, at 12:41 PM, Frédéric THOMAS wrote: The index view shows a bunch of modified and deleted files. I have not yet touched any of the git folders on my machine I just noticed you wrote that, can you show me the result of 'git st' ? -Fred -Message d'origine- From: Frédéric THOMAS Sent: Friday, April 05, 2013 11:33 AM To: dev@flex.apache.org Subject: Re: Still confused by git oops, reverse the 2 furst steps: -If you have some modified files in your working tree, save them first: git stash -u my current work -Checkout the develop branch: git co develop -Fred -Message d'origine- From: Frédéric THOMAS Sent: Friday, April 05, 2013 11:31 AM To: dev@flex.apache.org Subject: Re: Still confused by git You right Harbs, that currently looks something I dislike at the point I won't work anymore on that tree. Well, for your case (I assume you updated your .gitconfig as shown in the Wiki) : -If you have some modified files in your working tree, save them first: git stash -u my current work -Be sure the branch is up to date before to start working on it: git pull --rebase -create the branch you will work on, assuming your create a JIRA first: git co -b FLEX- -get back the work you save on this branch: git stash pop -Edit/add files/dirs -Add them to the staged area(also called index) and commit, you've got 2 choices, either you do 1 commit or more: 1- To add all of them in a once, that's in order to do only one commit: - git add . - git ci -m FLEX-: Fixed this 2- To add them one by one, that's in order to make more commits - git add myFile1 myFile2 - git ci -m FLEX-: Fixed this in my 1rst commit - git add myFile3 myFile4 - git ci -m FLEX-: Fixed this in my 2nd commit - check all the files are committed: git st - If there are more repeat the add/commit steps, otherwise, go back on the develop branch: git co develop - rebase your work on what the others did: git pull --rebase - Merge your branch to the develop one: git merge --no-ff FLEX- - you can now push: git push - you can remove your local branch if you want now it is unused: git br -d FLEX- I hope that helps -Fred -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 11:06 AM To: dev@flex.apache.org Subject: Re: Still confused by git Hi Fred, I've read those pages. (I see now you've updated them.) Conceptually, I sort of got the idea of how to do things, but I find that until I actually do something once, I don't quite get it… If someone could walk me through this once, I think I'l be a lot more comfortable that I'm doing things right. There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. Looking at the graph, it seems to me that not everyone is working exactly the same way. (unless I don't know how to read the graph, which is also possible…) On Apr 5, 2013, at 11:29 AM, Frédéric THOMAS wrote: Hi Harbs, Check the wiki first for a complete workflow guideline and git setup, if you need more info, ask them after you reviewed this wiki pages [1] [2], there are even interactive tutorials really well done. [1] [2] I advice that to everybody, for myself, until everyone understood and applied the basics written in the wiki, I won't touch the SDK anymore. -Fred [1] https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide [2] https://cwiki.apache.org/confluence/display/FLEX/Good+vs+Bad+Git+usage -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 10:14 AM To: dev@flex.apache.org Subject: Still confused by git I've tried to follow all the git discussions. But, after all the discussions on how to use git, I'm still confused on the basics. Here's what I need to know right now: Right now I have a number of files I've edited outside my working directory related to ColorPicker inside experimental. I'd like to commit this work to the develop branch. It probably makes sense to create a branch to indicate the work I'm doing on this. (or not?) I'm using SourceTree on Mac. I'd rather not mess with the command line. So far I've checked out develop and master. The index view shows a bunch of modified and deleted files. I have not yet touched any of the git folders on my machine. How do I? 1) Make sure my working copy is up to date? 2) Make sure my working coy is the correct branch? (Does that make sense?) 3) Create a new branch? (Or do I?) 4) Get my changes up to origin? I've seen a lot of talk about switching between branches, but this stuff is all very fuzzy to me and kind of scary… ;-) Harbs
Re: Still confused by git
I mean git status, but if you want to follow the commands I wrote, update your .gitconfig as described in the wiki -Fred -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 11:59 AM To: dev@flex.apache.org Subject: Re: Still confused by git git: 'st' is not a git command. See 'git --help'. Did you mean one of these? status reset stage stash svn On Apr 5, 2013, at 12:41 PM, Frédéric THOMAS wrote: The index view shows a bunch of modified and deleted files. I have not yet touched any of the git folders on my machine I just noticed you wrote that, can you show me the result of 'git st' ? -Fred -Message d'origine- From: Frédéric THOMAS Sent: Friday, April 05, 2013 11:33 AM To: dev@flex.apache.org Subject: Re: Still confused by git oops, reverse the 2 furst steps: -If you have some modified files in your working tree, save them first: git stash -u my current work -Checkout the develop branch: git co develop -Fred -Message d'origine- From: Frédéric THOMAS Sent: Friday, April 05, 2013 11:31 AM To: dev@flex.apache.org Subject: Re: Still confused by git You right Harbs, that currently looks something I dislike at the point I won't work anymore on that tree. Well, for your case (I assume you updated your .gitconfig as shown in the Wiki) : -If you have some modified files in your working tree, save them first: git stash -u my current work -Be sure the branch is up to date before to start working on it: git pull --rebase -create the branch you will work on, assuming your create a JIRA first: git co -b FLEX- -get back the work you save on this branch: git stash pop -Edit/add files/dirs -Add them to the staged area(also called index) and commit, you've got 2 choices, either you do 1 commit or more: 1- To add all of them in a once, that's in order to do only one commit: - git add . - git ci -m FLEX-: Fixed this 2- To add them one by one, that's in order to make more commits - git add myFile1 myFile2 - git ci -m FLEX-: Fixed this in my 1rst commit - git add myFile3 myFile4 - git ci -m FLEX-: Fixed this in my 2nd commit - check all the files are committed: git st - If there are more repeat the add/commit steps, otherwise, go back on the develop branch: git co develop - rebase your work on what the others did: git pull --rebase - Merge your branch to the develop one: git merge --no-ff FLEX- - you can now push: git push - you can remove your local branch if you want now it is unused: git br -d FLEX- I hope that helps -Fred -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 11:06 AM To: dev@flex.apache.org Subject: Re: Still confused by git Hi Fred, I've read those pages. (I see now you've updated them.) Conceptually, I sort of got the idea of how to do things, but I find that until I actually do something once, I don't quite get it… If someone could walk me through this once, I think I'l be a lot more comfortable that I'm doing things right. There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. Looking at the graph, it seems to me that not everyone is working exactly the same way. (unless I don't know how to read the graph, which is also possible…) On Apr 5, 2013, at 11:29 AM, Frédéric THOMAS wrote: Hi Harbs, Check the wiki first for a complete workflow guideline and git setup, if you need more info, ask them after you reviewed this wiki pages [1] [2], there are even interactive tutorials really well done. [1] [2] I advice that to everybody, for myself, until everyone understood and applied the basics written in the wiki, I won't touch the SDK anymore. -Fred [1] https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide [2] https://cwiki.apache.org/confluence/display/FLEX/Good+vs+Bad+Git+usage -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 10:14 AM To: dev@flex.apache.org Subject: Still confused by git I've tried to follow all the git discussions. But, after all the discussions on how to use git, I'm still confused on the basics. Here's what I need to know right now: Right now I have a number of files I've edited outside my working directory related to ColorPicker inside experimental. I'd like to commit this work to the develop branch. It probably makes sense to create a branch to indicate the work I'm doing on this. (or not?) I'm using SourceTree on Mac. I'd rather not mess with the command line. So far I've checked out develop and master. The index view shows a bunch of modified and deleted files. I have not yet touched any of the git folders on my machine. How do I? 1) Make sure my working copy is up to date? 2) Make sure my working coy is the correct branch? (Does that make sense?) 3) Create a new branch? (Or do I?) 4) Get my changes up to origin? I've seen a lot of talk about switching between branches, but this stuff is all
Re: Still confused by git
Thanks. I'll have to figure out how to translate that into the GUI of SourceTree. I'm not sure if I have the time today to play around with this. I'll probably get to it on Sunday… How do I know which branch the working copy is using and how do I switch? I started looking at tutorials, but this stuff is really not intuitive to me… :-( I'm just hoping I'll be glad I learned git when this is all over… ;-) Harbs On Apr 5, 2013, at 12:33 PM, Frédéric THOMAS wrote: oops, reverse the 2 furst steps: -If you have some modified files in your working tree, save them first: git stash -u my current work -Checkout the develop branch: git co develop -Fred -Message d'origine- From: Frédéric THOMAS Sent: Friday, April 05, 2013 11:31 AM To: dev@flex.apache.org Subject: Re: Still confused by git You right Harbs, that currently looks something I dislike at the point I won't work anymore on that tree. Well, for your case (I assume you updated your .gitconfig as shown in the Wiki) : -If you have some modified files in your working tree, save them first: git stash -u my current work -Be sure the branch is up to date before to start working on it: git pull --rebase -create the branch you will work on, assuming your create a JIRA first: git co -b FLEX- -get back the work you save on this branch: git stash pop -Edit/add files/dirs -Add them to the staged area(also called index) and commit, you've got 2 choices, either you do 1 commit or more: 1- To add all of them in a once, that's in order to do only one commit: - git add . - git ci -m FLEX-: Fixed this 2- To add them one by one, that's in order to make more commits - git add myFile1 myFile2 - git ci -m FLEX-: Fixed this in my 1rst commit - git add myFile3 myFile4 - git ci -m FLEX-: Fixed this in my 2nd commit - check all the files are committed: git st - If there are more repeat the add/commit steps, otherwise, go back on the develop branch: git co develop - rebase your work on what the others did: git pull --rebase - Merge your branch to the develop one: git merge --no-ff FLEX- - you can now push: git push - you can remove your local branch if you want now it is unused: git br -d FLEX- I hope that helps -Fred -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 11:06 AM To: dev@flex.apache.org Subject: Re: Still confused by git Hi Fred, I've read those pages. (I see now you've updated them.) Conceptually, I sort of got the idea of how to do things, but I find that until I actually do something once, I don't quite get it… If someone could walk me through this once, I think I'l be a lot more comfortable that I'm doing things right. There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. Looking at the graph, it seems to me that not everyone is working exactly the same way. (unless I don't know how to read the graph, which is also possible…) On Apr 5, 2013, at 11:29 AM, Frédéric THOMAS wrote: Hi Harbs, Check the wiki first for a complete workflow guideline and git setup, if you need more info, ask them after you reviewed this wiki pages [1] [2], there are even interactive tutorials really well done. [1] [2] I advice that to everybody, for myself, until everyone understood and applied the basics written in the wiki, I won't touch the SDK anymore. -Fred [1] https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide [2] https://cwiki.apache.org/confluence/display/FLEX/Good+vs+Bad+Git+usage -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 10:14 AM To: dev@flex.apache.org Subject: Still confused by git I've tried to follow all the git discussions. But, after all the discussions on how to use git, I'm still confused on the basics. Here's what I need to know right now: Right now I have a number of files I've edited outside my working directory related to ColorPicker inside experimental. I'd like to commit this work to the develop branch. It probably makes sense to create a branch to indicate the work I'm doing on this. (or not?) I'm using SourceTree on Mac. I'd rather not mess with the command line. So far I've checked out develop and master. The index view shows a bunch of modified and deleted files. I have not yet touched any of the git folders on my machine. How do I? 1) Make sure my working copy is up to date? 2) Make sure my working coy is the correct branch? (Does that make sense?) 3) Create a new branch? (Or do I?) 4) Get my changes up to origin? I've seen a lot of talk about switching between branches, but this stuff is all very fuzzy to me and kind of scary… ;-) Harbs
RE: Still confused by git
I still recommend Tortoise Git [1] to all new people running Windows... no command line needed (thank goodness). Just need to install MSysGit [2] as a pre-requisite and you're up and running. [1] http://code.google.com/p/tortoisegit/ [2] http://code.google.com/p/msysgit/downloads/list?q=net+installer -Mark -Original Message- From: Justin Mclean [mailto:jus...@classsoftware.com] Sent: Friday, April 05, 2013 5:45 AM To: dev@flex.apache.org Subject: Re: Still confused by git Hi, There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. I don't believe there is a consensus but that's mostly around how important it is to keep a clean history and with respect to Frederic obvious knowledge in this area we still need to come up with a way people new to git can contribute without knowing every intricate details of obscure options to git commands. In part because not everyone will use the command line. Thanks, Justin
Re: Still confused by git
SourceTree gives you access to the command line, I suggest you to start with the command line, once those basics commands known, that will then become easy to do it in sourceTree, in more, I can't teach you how to do that with sourceTree unless I do a screencast. -Fred -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 12:02 PM To: dev@flex.apache.org Subject: Re: Still confused by git Thanks. I'll have to figure out how to translate that into the GUI of SourceTree. I'm not sure if I have the time today to play around with this. I'll probably get to it on Sunday… How do I know which branch the working copy is using and how do I switch? I started looking at tutorials, but this stuff is really not intuitive to me… :-( I'm just hoping I'll be glad I learned git when this is all over… ;-) Harbs On Apr 5, 2013, at 12:33 PM, Frédéric THOMAS wrote: oops, reverse the 2 furst steps: -If you have some modified files in your working tree, save them first: git stash -u my current work -Checkout the develop branch: git co develop -Fred -Message d'origine- From: Frédéric THOMAS Sent: Friday, April 05, 2013 11:31 AM To: dev@flex.apache.org Subject: Re: Still confused by git You right Harbs, that currently looks something I dislike at the point I won't work anymore on that tree. Well, for your case (I assume you updated your .gitconfig as shown in the Wiki) : -If you have some modified files in your working tree, save them first: git stash -u my current work -Be sure the branch is up to date before to start working on it: git pull --rebase -create the branch you will work on, assuming your create a JIRA first: git co -b FLEX- -get back the work you save on this branch: git stash pop -Edit/add files/dirs -Add them to the staged area(also called index) and commit, you've got 2 choices, either you do 1 commit or more: 1- To add all of them in a once, that's in order to do only one commit: - git add . - git ci -m FLEX-: Fixed this 2- To add them one by one, that's in order to make more commits - git add myFile1 myFile2 - git ci -m FLEX-: Fixed this in my 1rst commit - git add myFile3 myFile4 - git ci -m FLEX-: Fixed this in my 2nd commit - check all the files are committed: git st - If there are more repeat the add/commit steps, otherwise, go back on the develop branch: git co develop - rebase your work on what the others did: git pull --rebase - Merge your branch to the develop one: git merge --no-ff FLEX- - you can now push: git push - you can remove your local branch if you want now it is unused: git br -d FLEX- I hope that helps -Fred -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 11:06 AM To: dev@flex.apache.org Subject: Re: Still confused by git Hi Fred, I've read those pages. (I see now you've updated them.) Conceptually, I sort of got the idea of how to do things, but I find that until I actually do something once, I don't quite get it… If someone could walk me through this once, I think I'l be a lot more comfortable that I'm doing things right. There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. Looking at the graph, it seems to me that not everyone is working exactly the same way. (unless I don't know how to read the graph, which is also possible…) On Apr 5, 2013, at 11:29 AM, Frédéric THOMAS wrote: Hi Harbs, Check the wiki first for a complete workflow guideline and git setup, if you need more info, ask them after you reviewed this wiki pages [1] [2], there are even interactive tutorials really well done. [1] [2] I advice that to everybody, for myself, until everyone understood and applied the basics written in the wiki, I won't touch the SDK anymore. -Fred [1] https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide [2] https://cwiki.apache.org/confluence/display/FLEX/Good+vs+Bad+Git+usage -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 10:14 AM To: dev@flex.apache.org Subject: Still confused by git I've tried to follow all the git discussions. But, after all the discussions on how to use git, I'm still confused on the basics. Here's what I need to know right now: Right now I have a number of files I've edited outside my working directory related to ColorPicker inside experimental. I'd like to commit this work to the develop branch. It probably makes sense to create a branch to indicate the work I'm doing on this. (or not?) I'm using SourceTree on Mac. I'd rather not mess with the command line. So far I've checked out develop and master. The index view shows a bunch of modified and deleted files. I have not yet touched any of the git folders on my machine. How do I? 1) Make sure my working copy is up to date? 2) Make sure my working coy is the correct branch? (Does that make sense?) 3) Create a new branch? (Or do I
Re: Still confused by git
I'm already stuck with the second step: git pull --rebase Cannot pull with rebase: Your index contains uncommitted changes. Please commit or stash them. I do not want any changes -- since I did not make any! What do I do? On Apr 5, 2013, at 12:31 PM, Frédéric THOMAS wrote: You right Harbs, that currently looks something I dislike at the point I won't work anymore on that tree. Well, for your case (I assume you updated your .gitconfig as shown in the Wiki) : -Checkout the develop branch: git co develop -If you have some modified files in your working tree, save them first: git stash -u my current work -Be sure the branch is up to date before to start working on it: git pull --rebase -create the branch you will work on, assuming your create a JIRA first: git co -b FLEX- -get back the work you save on this branch: git stash pop -Edit/add files/dirs -Add them to the staged area(also called index) and commit, you've got 2 choices, either you do 1 commit or more: 1- To add all of them in a once, that's in order to do only one commit: - git add . - git ci -m FLEX-: Fixed this 2- To add them one by one, that's in order to make more commits - git add myFile1 myFile2 - git ci -m FLEX-: Fixed this in my 1rst commit - git add myFile3 myFile4 - git ci -m FLEX-: Fixed this in my 2nd commit - check all the files are committed: git st - If there are more repeat the add/commit steps, otherwise, go back on the develop branch: git co develop - rebase your work on what the others did: git pull --rebase - Merge your branch to the develop one: git merge --no-ff FLEX- - you can now push: git push - you can remove your local branch if you want now it is unused: git br -d FLEX- I hope that helps -Fred -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 11:06 AM To: dev@flex.apache.org Subject: Re: Still confused by git Hi Fred, I've read those pages. (I see now you've updated them.) Conceptually, I sort of got the idea of how to do things, but I find that until I actually do something once, I don't quite get it… If someone could walk me through this once, I think I'l be a lot more comfortable that I'm doing things right. There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. Looking at the graph, it seems to me that not everyone is working exactly the same way. (unless I don't know how to read the graph, which is also possible…) On Apr 5, 2013, at 11:29 AM, Frédéric THOMAS wrote: Hi Harbs, Check the wiki first for a complete workflow guideline and git setup, if you need more info, ask them after you reviewed this wiki pages [1] [2], there are even interactive tutorials really well done. [1] [2] I advice that to everybody, for myself, until everyone understood and applied the basics written in the wiki, I won't touch the SDK anymore. -Fred [1] https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide [2] https://cwiki.apache.org/confluence/display/FLEX/Good+vs+Bad+Git+usage -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 10:14 AM To: dev@flex.apache.org Subject: Still confused by git I've tried to follow all the git discussions. But, after all the discussions on how to use git, I'm still confused on the basics. Here's what I need to know right now: Right now I have a number of files I've edited outside my working directory related to ColorPicker inside experimental. I'd like to commit this work to the develop branch. It probably makes sense to create a branch to indicate the work I'm doing on this. (or not?) I'm using SourceTree on Mac. I'd rather not mess with the command line. So far I've checked out develop and master. The index view shows a bunch of modified and deleted files. I have not yet touched any of the git folders on my machine. How do I? 1) Make sure my working copy is up to date? 2) Make sure my working coy is the correct branch? (Does that make sense?) 3) Create a new branch? (Or do I?) 4) Get my changes up to origin? I've seen a lot of talk about switching between branches, but this stuff is all very fuzzy to me and kind of scary… ;-) Harbs
Re: Still confused by git
Okay. I did it. It looks like I slightly messed up the last step. Sorry about that. I used SourceTree for the last step because I was not interested in typing my password into Terminal. I think there's a checkbox to push all tags that I should have unchecked… Thanks for the hand-holding on this… :-) Harbs On Apr 5, 2013, at 12:31 PM, Frédéric THOMAS wrote: You right Harbs, that currently looks something I dislike at the point I won't work anymore on that tree. Well, for your case (I assume you updated your .gitconfig as shown in the Wiki) : -Checkout the develop branch: git co develop -If you have some modified files in your working tree, save them first: git stash -u my current work -Be sure the branch is up to date before to start working on it: git pull --rebase -create the branch you will work on, assuming your create a JIRA first: git co -b FLEX- -get back the work you save on this branch: git stash pop -Edit/add files/dirs -Add them to the staged area(also called index) and commit, you've got 2 choices, either you do 1 commit or more: 1- To add all of them in a once, that's in order to do only one commit: - git add . - git ci -m FLEX-: Fixed this 2- To add them one by one, that's in order to make more commits - git add myFile1 myFile2 - git ci -m FLEX-: Fixed this in my 1rst commit - git add myFile3 myFile4 - git ci -m FLEX-: Fixed this in my 2nd commit - check all the files are committed: git st - If there are more repeat the add/commit steps, otherwise, go back on the develop branch: git co develop - rebase your work on what the others did: git pull --rebase - Merge your branch to the develop one: git merge --no-ff FLEX- - you can now push: git push - you can remove your local branch if you want now it is unused: git br -d FLEX- I hope that helps -Fred -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 11:06 AM To: dev@flex.apache.org Subject: Re: Still confused by git Hi Fred, I've read those pages. (I see now you've updated them.) Conceptually, I sort of got the idea of how to do things, but I find that until I actually do something once, I don't quite get it… If someone could walk me through this once, I think I'l be a lot more comfortable that I'm doing things right. There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. Looking at the graph, it seems to me that not everyone is working exactly the same way. (unless I don't know how to read the graph, which is also possible…) On Apr 5, 2013, at 11:29 AM, Frédéric THOMAS wrote: Hi Harbs, Check the wiki first for a complete workflow guideline and git setup, if you need more info, ask them after you reviewed this wiki pages [1] [2], there are even interactive tutorials really well done. [1] [2] I advice that to everybody, for myself, until everyone understood and applied the basics written in the wiki, I won't touch the SDK anymore. -Fred [1] https://cwiki.apache.org/confluence/display/FLEX/Git+for+Apache+Flex+Guide [2] https://cwiki.apache.org/confluence/display/FLEX/Good+vs+Bad+Git+usage -Message d'origine- From: Harbs Sent: Friday, April 05, 2013 10:14 AM To: dev@flex.apache.org Subject: Still confused by git I've tried to follow all the git discussions. But, after all the discussions on how to use git, I'm still confused on the basics. Here's what I need to know right now: Right now I have a number of files I've edited outside my working directory related to ColorPicker inside experimental. I'd like to commit this work to the develop branch. It probably makes sense to create a branch to indicate the work I'm doing on this. (or not?) I'm using SourceTree on Mac. I'd rather not mess with the command line. So far I've checked out develop and master. The index view shows a bunch of modified and deleted files. I have not yet touched any of the git folders on my machine. How do I? 1) Make sure my working copy is up to date? 2) Make sure my working coy is the correct branch? (Does that make sense?) 3) Create a new branch? (Or do I?) 4) Get my changes up to origin? I've seen a lot of talk about switching between branches, but this stuff is all very fuzzy to me and kind of scary… ;-) Harbs
Re: Still confused by git
+1 on this. I've been sitting on the sidelines the last few weeks for that reason. I know there are a lot of standards that still need to be figured out, and since I'm very green with GIT, I don't really have the time at the moment to learn all the command line (i've been really busy with personal and professional stuff the last few weeks as well). My goal is not to use the command line, but use my IDE like I did before. Dropping to the command line and typing 10 commands every time I want to do something is a pain in the rear for those things that my IDE should be doing for me (I usually have a dozen command prompt windows open at any given time, but those are for truly interactive things). -Nick On Fri, Apr 5, 2013 at 5:44 AM, Justin Mclean jus...@classsoftware.comwrote: Hi, There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. I don't believe there is a consensus but that's mostly around how important it is to keep a clean history and with respect to Frederic obvious knowledge in this area we still need to come up with a way people new to git can contribute without knowing every intricate details of obscure options to git commands. In part because not everyone will use the command line. Thanks, Justin
Re: Still confused by git
That's a good idea, I'm going to sit on the sideline too until at least PMCs want to learn the 10 basic commands and know how to use Git as describe, I just wonder how are going to react contributors and committers if even PMCs don't show the good example, well, to say the truth, I'm fed up, after 450 emails in March + 3 Wiki pages written to make the people understand and have a good workflow using Git and reading noone cars or wants to learn, I don't want to fight anymore and not even work on the SDK tree. Well, I already did my boxes closing the resolved JIRA, unassigned the others and committed my remote branch. I wish you a lot of pleasure. -Fred -Message d'origine- From: Nicholas Kwiatkowski Sent: Friday, April 05, 2013 2:11 PM To: dev@flex.apache.org Subject: Re: Still confused by git +1 on this. I've been sitting on the sidelines the last few weeks for that reason. I know there are a lot of standards that still need to be figured out, and since I'm very green with GIT, I don't really have the time at the moment to learn all the command line (i've been really busy with personal and professional stuff the last few weeks as well). My goal is not to use the command line, but use my IDE like I did before. Dropping to the command line and typing 10 commands every time I want to do something is a pain in the rear for those things that my IDE should be doing for me (I usually have a dozen command prompt windows open at any given time, but those are for truly interactive things). -Nick On Fri, Apr 5, 2013 at 5:44 AM, Justin Mclean jus...@classsoftware.comwrote: Hi, There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. I don't believe there is a consensus but that's mostly around how important it is to keep a clean history and with respect to Frederic obvious knowledge in this area we still need to come up with a way people new to git can contribute without knowing every intricate details of obscure options to git commands. In part because not everyone will use the command line. Thanks, Justin
RE: Still confused by git
Well the GUI's offer the same commands, they just have check boxes n such to select the different options of the command. I don't think it should matters if people learn the command line or GUI versions. Understanding what the commands do will happen more with practice. Reading the GIT online resources for the diagrams (example of one command [1]) helps to small degree. Should we setup a junk repo for people to play with the commands? (a shared one like on a GITHub repo). I know people could go out and setup their own. But I mean a structured one with populated content that gets reset to a known state weekly or after its been used. It could allow for practiced scenarios. [1] http://git-scm.com/book/en/Git-Branching-Rebasing -Mark -Original Message- From: Nicholas Kwiatkowski [mailto:nicho...@spoon.as] Sent: Friday, April 05, 2013 8:11 AM To: dev@flex.apache.org Subject: Re: Still confused by git +1 on this. I've been sitting on the sidelines the last few weeks for that reason. I know there are a lot of standards that still need to be figured out, and since I'm very green with GIT, I don't really have the time at the moment to learn all the command line (i've been really busy with personal and professional stuff the last few weeks as well). My goal is not to use the command line, but use my IDE like I did before. Dropping to the command line and typing 10 commands every time I want to do something is a pain in the rear for those things that my IDE should be doing for me (I usually have a dozen command prompt windows open at any given time, but those are for truly interactive things). -Nick
Re: Still confused by git
I'm sorry if I caused you to be fed up. I don't think it's that no-one cares or wants to learn. It's just that most of us have never used git before, and we have no clue what we're doing. It's a bit unnerving learning on such a big code base. I'm sure learning the basics of of git on a small project would be a lot easier… On Apr 5, 2013, at 4:01 PM, Frédéric THOMAS wrote: That's a good idea, I'm going to sit on the sideline too until at least PMCs want to learn the 10 basic commands and know how to use Git as describe, I just wonder how are going to react contributors and committers if even PMCs don't show the good example, well, to say the truth, I'm fed up, after 450 emails in March + 3 Wiki pages written to make the people understand and have a good workflow using Git and reading noone cars or wants to learn, I don't want to fight anymore and not even work on the SDK tree. Well, I already did my boxes closing the resolved JIRA, unassigned the others and committed my remote branch. I wish you a lot of pleasure. -Fred -Message d'origine- From: Nicholas Kwiatkowski Sent: Friday, April 05, 2013 2:11 PM To: dev@flex.apache.org Subject: Re: Still confused by git +1 on this. I've been sitting on the sidelines the last few weeks for that reason. I know there are a lot of standards that still need to be figured out, and since I'm very green with GIT, I don't really have the time at the moment to learn all the command line (i've been really busy with personal and professional stuff the last few weeks as well). My goal is not to use the command line, but use my IDE like I did before. Dropping to the command line and typing 10 commands every time I want to do something is a pain in the rear for those things that my IDE should be doing for me (I usually have a dozen command prompt windows open at any given time, but those are for truly interactive things). -Nick On Fri, Apr 5, 2013 at 5:44 AM, Justin Mclean jus...@classsoftware.comwrote: Hi, There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. I don't believe there is a consensus but that's mostly around how important it is to keep a clean history and with respect to Frederic obvious knowledge in this area we still need to come up with a way people new to git can contribute without knowing every intricate details of obscure options to git commands. In part because not everyone will use the command line. Thanks, Justin
Re: Still confused by git
That's not what I meant. It's in my plans to learn GIT, but I'm not going to be productive learning a new workflow with my 80+ hours of my FT job the last three weeks. My cheese was moved, and while I was trying to catch up the were still discussions about how to do things and what the standards were while I was trying to learn it. For me, the problem was the 450 emails over multiple threads that I couldn't keep up on. Personally I hate that everything relies on gitbash to do most commands under Windows. on my machine it's broken (hell, copy/paste only works half the time), so I'm always in the mode of trying to translate how to do X in an environment I'm not familiar with, on a complex project I could easily blow up, into something that at least lets me access my storage device where I'm supposed to be working. Nothing against you -- you've been helping out A LOT, but I'm just not up to speed yet. -Nick On Fri, Apr 5, 2013 at 9:01 AM, Frédéric THOMAS webdoubl...@hotmail.comwrote: That's a good idea, I'm going to sit on the sideline too until at least PMCs want to learn the 10 basic commands and know how to use Git as describe, I just wonder how are going to react contributors and committers if even PMCs don't show the good example, well, to say the truth, I'm fed up, after 450 emails in March + 3 Wiki pages written to make the people understand and have a good workflow using Git and reading noone cars or wants to learn, I don't want to fight anymore and not even work on the SDK tree. Well, I already did my boxes closing the resolved JIRA, unassigned the others and committed my remote branch. I wish you a lot of pleasure. -Fred -Message d'origine- From: Nicholas Kwiatkowski Sent: Friday, April 05, 2013 2:11 PM To: dev@flex.apache.org Subject: Re: Still confused by git +1 on this. I've been sitting on the sidelines the last few weeks for that reason. I know there are a lot of standards that still need to be figured out, and since I'm very green with GIT, I don't really have the time at the moment to learn all the command line (i've been really busy with personal and professional stuff the last few weeks as well). My goal is not to use the command line, but use my IDE like I did before. Dropping to the command line and typing 10 commands every time I want to do something is a pain in the rear for those things that my IDE should be doing for me (I usually have a dozen command prompt windows open at any given time, but those are for truly interactive things). -Nick On Fri, Apr 5, 2013 at 5:44 AM, Justin Mclean jus...@classsoftware.com** wrote: Hi, There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. I don't believe there is a consensus but that's mostly around how important it is to keep a clean history and with respect to Frederic obvious knowledge in this area we still need to come up with a way people new to git can contribute without knowing every intricate details of obscure options to git commands. In part because not everyone will use the command line. Thanks, Justin
Re: Still confused by git
In my quest to understand what's going on, maybe you can explain something to me. Most of your commits are flat in the graph, but a couple of them show as branches that are remerged. One example is FLEX-33451 Can you explain to me why that is? On Apr 5, 2013, at 4:01 PM, Frédéric THOMAS wrote: That's a good idea, I'm going to sit on the sideline too until at least PMCs want to learn the 10 basic commands and know how to use Git as describe, I just wonder how are going to react contributors and committers if even PMCs don't show the good example, well, to say the truth, I'm fed up, after 450 emails in March + 3 Wiki pages written to make the people understand and have a good workflow using Git and reading noone cars or wants to learn, I don't want to fight anymore and not even work on the SDK tree. Well, I already did my boxes closing the resolved JIRA, unassigned the others and committed my remote branch. I wish you a lot of pleasure. -Fred -Message d'origine- From: Nicholas Kwiatkowski Sent: Friday, April 05, 2013 2:11 PM To: dev@flex.apache.org Subject: Re: Still confused by git +1 on this. I've been sitting on the sidelines the last few weeks for that reason. I know there are a lot of standards that still need to be figured out, and since I'm very green with GIT, I don't really have the time at the moment to learn all the command line (i've been really busy with personal and professional stuff the last few weeks as well). My goal is not to use the command line, but use my IDE like I did before. Dropping to the command line and typing 10 commands every time I want to do something is a pain in the rear for those things that my IDE should be doing for me (I usually have a dozen command prompt windows open at any given time, but those are for truly interactive things). -Nick On Fri, Apr 5, 2013 at 5:44 AM, Justin Mclean jus...@classsoftware.comwrote: Hi, There's also been a lot of discussion on when to rebase and when not. I'm not clear on whether there has been a consensus on that. I don't believe there is a consensus but that's mostly around how important it is to keep a clean history and with respect to Frederic obvious knowledge in this area we still need to come up with a way people new to git can contribute without knowing every intricate details of obscure options to git commands. In part because not everyone will use the command line. Thanks, Justin
Re: Still confused by git
Hi, after 450 emails in March + 3 Wiki pages written to make the people understand and have a good workflow using Git and reading noone cars or wants to learn I for one appreciated the effort and I have learnt a lot form it. It is a lot to take on and it's seemed to become very complex very quickly. I think a little patience all around is all that's needed. Thanks, Justin
