Git: How To Test after Merging into Production Master BranchHow to remove local (untracked) files from the current Git working treeHow to clone all remote branches in Git?How to resolve merge conflicts in GitHow do I undo 'git add' before commit?How do I undo the most recent local commits in Git?How do I check out a remote Git branch?How do I delete a Git branch locally and remotely?How to replace master branch in Git, entirely, from another branch?How do I revert a Git repository to a previous commit?How do I rename a local Git branch?
First Number to Contain Each Letter
Is every sentence we write or utter either true or false?
How do you say "to hell with everything" in French?
Cube stereo 150 race "do not clamp" warning
Can the leading note resolve down?
Project Euler Problem 45
Infinitely many primes
Why has Marx's "Das Kapital" been translated to "Capital" in English and not "The Capital"
Golfball Dimples on spaceships (and planes)?
Is Sanskrit really the mother of all languages?
Is there some sort of French saying for "a person's signature move"?
Putting future professor position on CV
Why are there no wireless switches?
I won a car in a poker game. How is that taxed in Canada?
Why does 8 bit truecolor use only 2 bits for blue?
What does "先が気になる" mean?
Should I tip on the Amtrak train?
Friend is very nit picky about side comments I don't intend to be taken too seriously
What is a DeepWord™?
Dissuading my girlfriend from a scam
Do 643,000 Americans go bankrupt every year due to medical bills?
Supervisor wants me to support a diploma-thesis SW tool after I graduated
Poor management handling of recent sickness and how to approach my return?
At what point does a land become controlled?
Git: How To Test after Merging into Production Master Branch
How to remove local (untracked) files from the current Git working treeHow to clone all remote branches in Git?How to resolve merge conflicts in GitHow do I undo 'git add' before commit?How do I undo the most recent local commits in Git?How do I check out a remote Git branch?How do I delete a Git branch locally and remotely?How to replace master branch in Git, entirely, from another branch?How do I revert a Git repository to a previous commit?How do I rename a local Git branch?
.everyoneloves__top-leaderboard:empty,.everyoneloves__mid-leaderboard:empty,.everyoneloves__bot-mid-leaderboard:empty margin-bottom:0;
We are currently working on Release Version 2. Right now All our part 2 changes work successfully in our Dev, QA, and UAT environments! However, when we merge back into master branch, doesn't the very act of merging or not merging properly/incorrectly cause problems? So how do we solve this issue?
Should we take the deployable artifacts after the Master branch merge, and ensure they work correctly again in QA and UAT? We have had issues with merging, so trying to figure out the best source control and testing strategy
git merge .net-core devops
edited Mar 28 at 5:27
Martin Smith51
174 bronze badges
asked Mar 28 at 5:20
Adam MarcusAdam Marcus
136 bronze badges
add a comment |
We are currently working on Release Version 2. Right now All our part 2 changes work successfully in our Dev, QA, and UAT environments! However, when we merge back into master branch, doesn't the very act of merging or not merging properly/incorrectly cause problems? So how do we solve this issue?
Should we take the deployable artifacts after the Master branch merge, and ensure they work correctly again in QA and UAT? We have had issues with merging, so trying to figure out the best source control and testing strategy
git merge .net-core devops
edited Mar 28 at 5:27
Martin Smith51
174 bronze badges
asked Mar 28 at 5:20
Adam MarcusAdam Marcus
136 bronze badges
you could compare thedevelopbranch to themasterbranch. If they have same contents or showing the latest changes on develop, the must be same.Merge conflicts, depending on the resolution, might result to a different content.
– marlo
Mar 28 at 5:32
add a comment |
We are currently working on Release Version 2. Right now All our part 2 changes work successfully in our Dev, QA, and UAT environments! However, when we merge back into master branch, doesn't the very act of merging or not merging properly/incorrectly cause problems? So how do we solve this issue?
Should we take the deployable artifacts after the Master branch merge, and ensure they work correctly again in QA and UAT? We have had issues with merging, so trying to figure out the best source control and testing strategy
git merge .net-core devops
edited Mar 28 at 5:27
Martin Smith51
174 bronze badges
asked Mar 28 at 5:20
Adam MarcusAdam Marcus
136 bronze badges
We are currently working on Release Version 2. Right now All our part 2 changes work successfully in our Dev, QA, and UAT environments! However, when we merge back into master branch, doesn't the very act of merging or not merging properly/incorrectly cause problems? So how do we solve this issue?
Should we take the deployable artifacts after the Master branch merge, and ensure they work correctly again in QA and UAT? We have had issues with merging, so trying to figure out the best source control and testing strategy
git merge .net-core devops
git merge .net-core devops
edited Mar 28 at 5:27
Martin Smith51
174 bronze badges
asked Mar 28 at 5:20
Adam MarcusAdam Marcus
136 bronze badges
edited Mar 28 at 5:27
Martin Smith51
174 bronze badges
asked Mar 28 at 5:20
Adam MarcusAdam Marcus
136 bronze badges
edited Mar 28 at 5:27
Martin Smith51
174 bronze badges
edited Mar 28 at 5:27
Martin Smith51
174 bronze badges
edited Mar 28 at 5:27
Martin Smith51
174 bronze badges
174 bronze badges
asked Mar 28 at 5:20
Adam MarcusAdam Marcus
136 bronze badges
asked Mar 28 at 5:20
Adam MarcusAdam Marcus
136 bronze badges
asked Mar 28 at 5:20
Adam MarcusAdam Marcus
136 bronze badges
136 bronze badges
you could compare thedevelopbranch to themasterbranch. If they have same contents or showing the latest changes on develop, the must be same.Merge conflicts, depending on the resolution, might result to a different content.
– marlo
Mar 28 at 5:32
add a comment |
you could compare thedevelopbranch to themasterbranch. If they have same contents or showing the latest changes on develop, the must be same.Merge conflicts, depending on the resolution, might result to a different content.
– marlo
Mar 28 at 5:32
you could compare the
develop branch to the master branch. If they have same contents or showing the latest changes on develop, the must be same. Merge conflicts, depending on the resolution, might result to a different content.– marlo
Mar 28 at 5:32
you could compare the
develop branch to the master branch. If they have same contents or showing the latest changes on develop, the must be same. Merge conflicts, depending on the resolution, might result to a different content.– marlo
Mar 28 at 5:32
add a comment |
1 Answer
1
active
oldest
votes
In your schema, the merge would be a fast-forward one, which means HEAD master would simply reference develop HEAD: its content would be identical that what you are merging, because there was no evolution done in master while develop was updated.
Even if you do a git merge --no-ff, the resulting merge commit would be identical to develop HEAD.
If the content is exactly the same, past tests should stand.
answered Mar 28 at 5:28
VonCVonC
890k327 gold badges2882 silver badges3468 bronze badges
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%2f55390646%2fgit-how-to-test-after-merging-into-production-master-branch%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
In your schema, the merge would be a fast-forward one, which means HEAD master would simply reference develop HEAD: its content would be identical that what you are merging, because there was no evolution done in master while develop was updated.
Even if you do a git merge --no-ff, the resulting merge commit would be identical to develop HEAD.
If the content is exactly the same, past tests should stand.
answered Mar 28 at 5:28
VonCVonC
890k327 gold badges2882 silver badges3468 bronze badges
add a comment |
In your schema, the merge would be a fast-forward one, which means HEAD master would simply reference develop HEAD: its content would be identical that what you are merging, because there was no evolution done in master while develop was updated.
Even if you do a git merge --no-ff, the resulting merge commit would be identical to develop HEAD.
If the content is exactly the same, past tests should stand.
answered Mar 28 at 5:28
VonCVonC
890k327 gold badges2882 silver badges3468 bronze badges
add a comment |
In your schema, the merge would be a fast-forward one, which means HEAD master would simply reference develop HEAD: its content would be identical that what you are merging, because there was no evolution done in master while develop was updated.
Even if you do a git merge --no-ff, the resulting merge commit would be identical to develop HEAD.
If the content is exactly the same, past tests should stand.
answered Mar 28 at 5:28
VonCVonC
890k327 gold badges2882 silver badges3468 bronze badges
In your schema, the merge would be a fast-forward one, which means HEAD master would simply reference develop HEAD: its content would be identical that what you are merging, because there was no evolution done in master while develop was updated.
Even if you do a git merge --no-ff, the resulting merge commit would be identical to develop HEAD.
If the content is exactly the same, past tests should stand.
answered Mar 28 at 5:28
VonCVonC
890k327 gold badges2882 silver badges3468 bronze badges
answered Mar 28 at 5:28
VonCVonC
890k327 gold badges2882 silver badges3468 bronze badges
answered Mar 28 at 5:28
VonCVonC
890k327 gold badges2882 silver badges3468 bronze badges
answered Mar 28 at 5:28
VonCVonC
890k327 gold badges2882 silver badges3468 bronze badges
890k327 gold badges2882 silver badges3468 bronze badges
add a comment |
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%2f55390646%2fgit-how-to-test-after-merging-into-production-master-branch%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
you could compare the
developbranch to themasterbranch. If they have same contents or showing the latest changes on develop, the must be same.Merge conflicts, depending on the resolution, might result to a different content.– marlo
Mar 28 at 5:32