Error workingspace.xml error that pops up every time you pull on bitbucket

The error message is as follows

git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree pull origin master From https://bitbucket.org/dexelop/dexelop

The environment I use is OSX and Windows I'm not familiar with git, so I'm using http://www.bitbucket.org through an application called sourcetree.

I always get the error message above when I pull it, but I don't know the reason.

I found it in stackoverflow, but maybe it's because I can't speak English. It's hard to understand.

git

2022-09-22 21:41

1 Answers

There is a conflict because the source has changed before git pull is received. It can be solved in three ways.

(1) Commit the source you changed before receiving git pull and receive the pull, (2) If you don't need a changed source, if you do git reset, the changed source will be blown away. You can either get a pull afterwards (3) Alternatively, if you want to temporarily save the source you changed now and commit it later, you can temporarily save the source and reload it later. You can get a pull after stash.

2022-09-22 21:41

If you have any answers or tips

Popular Tags

python x 4647

android x 1593

java x 1494

javascript x 1427

c x 927

c++ x 878

ruby-on-rails x 696

php x 692

python3 x 685

html x 656