Could commit operation cover others' modification without conflict warning?SVN 409 conflict on commits and updatesSubversion workflow: force update, build, test before commitShould we always update before committing in SVN?Svn also ws show green check boxsubversion (1.7) commit merged files, including mergeinfo but leave other modified filesSVN Commit IssuesSVN - cannot resolve conflictprevent a user from performing “SVN update” on a locked files in tortoise svnWhy can't I commit changes in a conflicted state?Tortoise SVN not checking for conflicts?
How much would a 1 foot tall human weigh?
How to make a bold sparkline in Google Sheets?
What is this gigantic dish at Ben Gurion airport?
Can a character with good/neutral alignment attune to a sentient magic item with evil alignment?
Teleport everything in a large zone; or teleport all living things and make a lot of equipment disappear
How to give my students a straightedge instead of a ruler
Seven Places at Once - Another Google Earth Challenge?
Can derivatives be defined as anti-integrals?
Why does the speed of sound decrease at high altitudes although the air density decreases?
Unable to find solution to 6 simultaneous equations
Are there objective criteria for classifying consonance v. dissonance?
Difference between system uptime and last boot time in windows
Is "you will become a subject matter expert" code for "you'll be working on your own 100% of the time"?
What is the meaning of 「ぞんぞん」?
Bit one of the Intel 8080's Flags register
Impossible Scrabble Words
How do certain apps show new notifications when internet access is restricted to them?
What is the source of "You can achieve a lot with hate, but even more with love" (Shakespeare?)
Python web-scraper to download table of transistor counts from Wikipedia
How can I use expandafter the expand the definition of this control sequence?
Some Prime Peerage
Is it possible to format a USB from a live USB?
Permutations in Disguise
What organs or modifications would be needed for a life biological creature not to require sleep?
Could commit operation cover others' modification without conflict warning?
SVN 409 conflict on commits and updatesSubversion workflow: force update, build, test before commitShould we always update before committing in SVN?Svn also ws show green check boxsubversion (1.7) commit merged files, including mergeinfo but leave other modified filesSVN Commit IssuesSVN - cannot resolve conflictprevent a user from performing “SVN update” on a locked files in tortoise svnWhy can't I commit changes in a conflicted state?Tortoise SVN not checking for conflicts?
.everyoneloves__top-leaderboard:empty,.everyoneloves__mid-leaderboard:empty,.everyoneloves__bot-mid-leaderboard:empty margin-bottom:0;
I seldom execute update operation before commit because I think once others have modified the file already, then when I commit that file the conflict warnings would occur. At least I wouldn't cover others' submission.
But is it possible that I might cover others' submission without warning message when using commit operation?
In other words, must I always execute update operation before commit to avoid covering others' submission?
svn tortoisesvn
asked Mar 28 at 12:17
bigxiaobigxiao
1,5059 silver badges27 bronze badges
add a comment
|
I seldom execute update operation before commit because I think once others have modified the file already, then when I commit that file the conflict warnings would occur. At least I wouldn't cover others' submission.
But is it possible that I might cover others' submission without warning message when using commit operation?
In other words, must I always execute update operation before commit to avoid covering others' submission?
svn tortoisesvn
asked Mar 28 at 12:17
bigxiaobigxiao
1,5059 silver badges27 bronze badges
add a comment
|
I seldom execute update operation before commit because I think once others have modified the file already, then when I commit that file the conflict warnings would occur. At least I wouldn't cover others' submission.
But is it possible that I might cover others' submission without warning message when using commit operation?
In other words, must I always execute update operation before commit to avoid covering others' submission?
svn tortoisesvn
asked Mar 28 at 12:17
bigxiaobigxiao
1,5059 silver badges27 bronze badges
I seldom execute update operation before commit because I think once others have modified the file already, then when I commit that file the conflict warnings would occur. At least I wouldn't cover others' submission.
But is it possible that I might cover others' submission without warning message when using commit operation?
In other words, must I always execute update operation before commit to avoid covering others' submission?
svn tortoisesvn
svn tortoisesvn
asked Mar 28 at 12:17
bigxiaobigxiao
1,5059 silver badges27 bronze badges
asked Mar 28 at 12:17
bigxiaobigxiao
1,5059 silver badges27 bronze badges
asked Mar 28 at 12:17
bigxiaobigxiao
1,5059 silver badges27 bronze badges
asked Mar 28 at 12:17
bigxiaobigxiao
1,5059 silver badges27 bronze badges
asked Mar 28 at 12:17
bigxiaobigxiao
1,5059 silver badges27 bronze badges
1,5059 silver badges27 bronze badges
add a comment
|
add a comment
|
1 Answer
1
active
oldest
votes
You should always update, for sure. Otherwise, under normal conditions (every project is different), how can you make sure that your changes are working fine with other developer's changes? It's not a matter of only conflicts. Say, a java project. You add a class import to the class that you are working on.... but then on one of the recent revisions from other developers, that class you are importing is gone.... you will commit, no conflict whatsoever but the project is busted.
answered Mar 28 at 14:06
eftshift0eftshift0
8,3081 gold badge13 silver badges24 bronze badges
I never used java, can you explain why the project is busted?
– bigxiao
Mar 29 at 12:54
That's just an example of how to break a project by not updating and pushing without conflicts.... in this case, you added a dependency (say) on a file that existed on the project.... on your working copy it was all perfect, you compile, it works.... but while you were working, another developer removed that file that your code depends on.... you didn't notice because you didn't update.... you push, it goes fine (no other developer changes things on the lines of code that you did.... no conflict)... but now your just-pushed code is depending on a file that is gone. So it's busted.
– eftshift0
Mar 29 at 15:03
add a comment
|
Your Answer
StackExchange.ifUsing("editor", function ()
StackExchange.using("externalEditor", function ()
StackExchange.using("snippets", function ()
StackExchange.snippets.init();
);
);
, "code-snippets");
StackExchange.ready(function()
var channelOptions =
tags: "".split(" "),
id: "1"
;
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function()
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled)
StackExchange.using("snippets", function()
createEditor();
);
else
createEditor();
);
function createEditor()
StackExchange.prepareEditor(
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader:
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/4.0/"u003ecc by-sa 4.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
,
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
);
);
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f55397439%2fcould-commit-operation-cover-others-modification-without-conflict-warning%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
1 Answer
1
active
oldest
votes
1 Answer
1
active
oldest
votes
active
oldest
votes
active
oldest
votes
You should always update, for sure. Otherwise, under normal conditions (every project is different), how can you make sure that your changes are working fine with other developer's changes? It's not a matter of only conflicts. Say, a java project. You add a class import to the class that you are working on.... but then on one of the recent revisions from other developers, that class you are importing is gone.... you will commit, no conflict whatsoever but the project is busted.
answered Mar 28 at 14:06
eftshift0eftshift0
8,3081 gold badge13 silver badges24 bronze badges
I never used java, can you explain why the project is busted?
– bigxiao
Mar 29 at 12:54
That's just an example of how to break a project by not updating and pushing without conflicts.... in this case, you added a dependency (say) on a file that existed on the project.... on your working copy it was all perfect, you compile, it works.... but while you were working, another developer removed that file that your code depends on.... you didn't notice because you didn't update.... you push, it goes fine (no other developer changes things on the lines of code that you did.... no conflict)... but now your just-pushed code is depending on a file that is gone. So it's busted.
– eftshift0
Mar 29 at 15:03
add a comment
|
You should always update, for sure. Otherwise, under normal conditions (every project is different), how can you make sure that your changes are working fine with other developer's changes? It's not a matter of only conflicts. Say, a java project. You add a class import to the class that you are working on.... but then on one of the recent revisions from other developers, that class you are importing is gone.... you will commit, no conflict whatsoever but the project is busted.
answered Mar 28 at 14:06
eftshift0eftshift0
8,3081 gold badge13 silver badges24 bronze badges
I never used java, can you explain why the project is busted?
– bigxiao
Mar 29 at 12:54
That's just an example of how to break a project by not updating and pushing without conflicts.... in this case, you added a dependency (say) on a file that existed on the project.... on your working copy it was all perfect, you compile, it works.... but while you were working, another developer removed that file that your code depends on.... you didn't notice because you didn't update.... you push, it goes fine (no other developer changes things on the lines of code that you did.... no conflict)... but now your just-pushed code is depending on a file that is gone. So it's busted.
– eftshift0
Mar 29 at 15:03
add a comment
|
You should always update, for sure. Otherwise, under normal conditions (every project is different), how can you make sure that your changes are working fine with other developer's changes? It's not a matter of only conflicts. Say, a java project. You add a class import to the class that you are working on.... but then on one of the recent revisions from other developers, that class you are importing is gone.... you will commit, no conflict whatsoever but the project is busted.
answered Mar 28 at 14:06
eftshift0eftshift0
8,3081 gold badge13 silver badges24 bronze badges
You should always update, for sure. Otherwise, under normal conditions (every project is different), how can you make sure that your changes are working fine with other developer's changes? It's not a matter of only conflicts. Say, a java project. You add a class import to the class that you are working on.... but then on one of the recent revisions from other developers, that class you are importing is gone.... you will commit, no conflict whatsoever but the project is busted.
answered Mar 28 at 14:06
eftshift0eftshift0
8,3081 gold badge13 silver badges24 bronze badges
answered Mar 28 at 14:06
eftshift0eftshift0
8,3081 gold badge13 silver badges24 bronze badges
answered Mar 28 at 14:06
eftshift0eftshift0
8,3081 gold badge13 silver badges24 bronze badges
answered Mar 28 at 14:06
eftshift0eftshift0
8,3081 gold badge13 silver badges24 bronze badges
8,3081 gold badge13 silver badges24 bronze badges
I never used java, can you explain why the project is busted?
– bigxiao
Mar 29 at 12:54
That's just an example of how to break a project by not updating and pushing without conflicts.... in this case, you added a dependency (say) on a file that existed on the project.... on your working copy it was all perfect, you compile, it works.... but while you were working, another developer removed that file that your code depends on.... you didn't notice because you didn't update.... you push, it goes fine (no other developer changes things on the lines of code that you did.... no conflict)... but now your just-pushed code is depending on a file that is gone. So it's busted.
– eftshift0
Mar 29 at 15:03
add a comment
|
I never used java, can you explain why the project is busted?
– bigxiao
Mar 29 at 12:54
That's just an example of how to break a project by not updating and pushing without conflicts.... in this case, you added a dependency (say) on a file that existed on the project.... on your working copy it was all perfect, you compile, it works.... but while you were working, another developer removed that file that your code depends on.... you didn't notice because you didn't update.... you push, it goes fine (no other developer changes things on the lines of code that you did.... no conflict)... but now your just-pushed code is depending on a file that is gone. So it's busted.
– eftshift0
Mar 29 at 15:03
I never used java, can you explain why the project is busted?
– bigxiao
Mar 29 at 12:54
I never used java, can you explain why the project is busted?
– bigxiao
Mar 29 at 12:54
That's just an example of how to break a project by not updating and pushing without conflicts.... in this case, you added a dependency (say) on a file that existed on the project.... on your working copy it was all perfect, you compile, it works.... but while you were working, another developer removed that file that your code depends on.... you didn't notice because you didn't update.... you push, it goes fine (no other developer changes things on the lines of code that you did.... no conflict)... but now your just-pushed code is depending on a file that is gone. So it's busted.
– eftshift0
Mar 29 at 15:03
That's just an example of how to break a project by not updating and pushing without conflicts.... in this case, you added a dependency (say) on a file that existed on the project.... on your working copy it was all perfect, you compile, it works.... but while you were working, another developer removed that file that your code depends on.... you didn't notice because you didn't update.... you push, it goes fine (no other developer changes things on the lines of code that you did.... no conflict)... but now your just-pushed code is depending on a file that is gone. So it's busted.
– eftshift0
Mar 29 at 15:03
add a comment
|
Got a question that you can’t ask on public Stack Overflow? Learn more about sharing private information with Stack Overflow for Teams.
Got a question that you can’t ask on public Stack Overflow? Learn more about sharing private information with Stack Overflow for Teams.
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function ()
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f55397439%2fcould-commit-operation-cover-others-modification-without-conflict-warning%23new-answer', 'question_page');
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function ()
StackExchange.helpers.onClickDraftSave('#login-link');
);
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
