I'm still struggling with git.
The fact is that
We are working on a two-person project.
I created a new branch from the main relationship.
Now my friend has updated the wizard, but I need to fix some errors.
When I switch to a branch in Netbeans, he gives me all my "relationships" - changes and wants me to make them.
This is not what I'm looking for!
The Netbeans website informs me about this [Switch to branch]:
Switch to Branch
Actor: User
Action: User wants to switch to a branch (see also Checkout)
"Priority:" 1
Scenario:
User selects a versioned context and invokes 'switch branch' from the main menu
User specifies the branch and additional options - keep local changes etc.
The working tree is switched to the specified branch
and [Checkout]:
order
Actor: User
Action: User wants to checkout a specific revision/tag/branch
"Priority:" 1
Scenario:
User selects a a versioned context and invokes 'chekout' from the main menu
User specifies the revision/tag/branch to checkout
The working tree will be switched to the specified revision
I get a headache from GIT!
So what's the difference between the two?
I need someone to be able to switch to the [Master] branch, and then update the errors, and then return to my [Relation] branch without git, so that I will be informed of the changes from [Relation] when I am on the [Master] branch
source
share