This question is locked. New answers and comments are not allowed.
Hi
Earlier today I chose to commit my code from my server which lead to an unknown error in graphite. Essentially the commit failed and I tried again.
On the second time I received no warning or error and so thought it had completed successfully.
Later in the day, on a laptop, I opened my workspace on graphite and started working. It was only later that I noticed that the changes made in the morning were not in the code I was working on. I was now in a state where I had one code base with a fair amount of changes , minus the code changes from earlier in the day.
I've had to manually resolve this issue (carefully) and now want to push the changes on the laptop back to the repository.
I'm now in a position where I am stuck as I have 9 items that were removed from the solution and so when I try to commit my workspace from my laptop, it fails as it can not find those assets on this machine (They are on the one from earlier in the day)
What options are available to resolve this? Apart from doing a release, it stops any updates going through to ION as I cannot push up all of the changes.
Thoughts?
Earlier today I chose to commit my code from my server which lead to an unknown error in graphite. Essentially the commit failed and I tried again.
On the second time I received no warning or error and so thought it had completed successfully.
Later in the day, on a laptop, I opened my workspace on graphite and started working. It was only later that I noticed that the changes made in the morning were not in the code I was working on. I was now in a state where I had one code base with a fair amount of changes , minus the code changes from earlier in the day.
I've had to manually resolve this issue (carefully) and now want to push the changes on the laptop back to the repository.
I'm now in a position where I am stuck as I have 9 items that were removed from the solution and so when I try to commit my workspace from my laptop, it fails as it can not find those assets on this machine (They are on the one from earlier in the day)
What options are available to resolve this? Apart from doing a release, it stops any updates going through to ION as I cannot push up all of the changes.
Thoughts?