Bitbucket questions
I am new to using bitbucket and have a question.
#1 If there is a line in the code that I have to change to run on my machine is there a way to keep it when I do a sync?
#2 Sometimes I make changes and play with my version and when a new version comes out. It won't let me sync because I have uncommitted changes. How can I get it to just over write what I have?
#1 If there is a line in the code that I have to change to run on my machine is there a way to keep it when I do a sync?
#2 Sometimes I make changes and play with my version and when a new version comes out. It won't let me sync because I have uncommitted changes. How can I get it to just over write what I have?
Can't you keep your changes in a local branch and rebase it on the result of the sync?
ASKER
How do you do this?
Are you using Git from Visual Studio or from the command line?
ASKER
I am using bitbucket via visual studio.
If I understand correctly, your changes are on the master branch.
In the Team Explorer window, right-click the master branch and select "New local branch". Give it a name. It should contain your changes.
Remove your changes from the master branch.
After you retrieve a new version of the master branch, right-click on your local branch and select "Rebase on". Select the master branch as the branch to rebase on. Click the "Rebase" button.
In the Team Explorer window, right-click the master branch and select "New local branch". Give it a name. It should contain your changes.
Remove your changes from the master branch.
After you retrieve a new version of the master branch, right-click on your local branch and select "Rebase on". Select the master branch as the branch to rebase on. Click the "Rebase" button.
ASKER
I am having trouble figuring out where to right click?
Are you referring to this screen?
How do I remove my changes to the master branch?
Are you referring to this screen?
How do I remove my changes to the master branch?
I supposed that there was a master branch and that your changes were there.
If the branch were you made changes is not named "master", it's not important, use it instead of "master".
If the branch were you made changes is not named "master", it's not important, use it instead of "master".
ASKER
Louis, Sorry, but I am very new to this, and I don't understand what your saying. I see no "rebase" option where ever I click.
Its a project that only has one person contributing to it. He makes changes, and then I sync.
If I make changes to pay around then when I want to update to the next version it won't let me. I have found a way to go through each part and undo changes, but I have to click each part and undo changes.
I am wanting a way to just get the current version and ignore all my changes. It may not be possible, but that is what I was after?
The other thing I have is there are some variables I have to change ever time I get the file from him. Whats the best way to work around that?
Its a project that only has one person contributing to it. He makes changes, and then I sync.
If I make changes to pay around then when I want to update to the next version it won't let me. I have found a way to go through each part and undo changes, but I have to click each part and undo changes.
I am wanting a way to just get the current version and ignore all my changes. It may not be possible, but that is what I was after?
The other thing I have is there are some variables I have to change ever time I get the file from him. Whats the best way to work around that?
ASKER CERTIFIED SOLUTION
membership
This solution is only available to members.
To access this solution, you must be a member of Experts Exchange.
ASKER
Thanks that was it!
The author said that is the solution but it looks like he forgot to close the question.