Android Studio seems to merge my branches automatically
I'm a beginner, so as far as I know this question sounds like it can't be, but it is the second time it happened already.
I have a "master" for publishing and then "development" for, then I open more branches for specific function trials.
For the second time already, I open a branch, let's call it "photo gallery feature", check it out, and 100% working on that branch.
Then, I feel like I want to ditch the code and restart so I go back to my development branch, and all the code I was writing in "photo gallery feature" is there.
What am I doing wrong?
android-studio
edited Feb 15 at 4:01
Scott
16.1k113990
asked Feb 15 at 0:00
TsabaryTsabary
11
add a comment |
I'm a beginner, so as far as I know this question sounds like it can't be, but it is the second time it happened already.
I have a "master" for publishing and then "development" for, then I open more branches for specific function trials.
For the second time already, I open a branch, let's call it "photo gallery feature", check it out, and 100% working on that branch.
Then, I feel like I want to ditch the code and restart so I go back to my development branch, and all the code I was writing in "photo gallery feature" is there.
What am I doing wrong?
android-studio
edited Feb 15 at 4:01
Scott
16.1k113990
asked Feb 15 at 0:00
TsabaryTsabary
11
add a comment |
I'm a beginner, so as far as I know this question sounds like it can't be, but it is the second time it happened already.
I have a "master" for publishing and then "development" for, then I open more branches for specific function trials.
For the second time already, I open a branch, let's call it "photo gallery feature", check it out, and 100% working on that branch.
Then, I feel like I want to ditch the code and restart so I go back to my development branch, and all the code I was writing in "photo gallery feature" is there.
What am I doing wrong?
android-studio
edited Feb 15 at 4:01
Scott
16.1k113990
asked Feb 15 at 0:00
TsabaryTsabary
11
I'm a beginner, so as far as I know this question sounds like it can't be, but it is the second time it happened already.
I have a "master" for publishing and then "development" for, then I open more branches for specific function trials.
For the second time already, I open a branch, let's call it "photo gallery feature", check it out, and 100% working on that branch.
Then, I feel like I want to ditch the code and restart so I go back to my development branch, and all the code I was writing in "photo gallery feature" is there.
What am I doing wrong?
android-studio
android-studio
edited Feb 15 at 4:01
Scott
16.1k113990
asked Feb 15 at 0:00
TsabaryTsabary
11
edited Feb 15 at 4:01
Scott
16.1k113990
asked Feb 15 at 0:00
TsabaryTsabary
11
edited Feb 15 at 4:01
Scott
16.1k113990
edited Feb 15 at 4:01
Scott
16.1k113990
edited Feb 15 at 4:01
Scott
16.1k113990
16.1k113990
asked Feb 15 at 0:00
TsabaryTsabary
11
asked Feb 15 at 0:00
TsabaryTsabary
11
asked Feb 15 at 0:00
TsabaryTsabary
11
11
add a comment |
add a comment |
0
active
oldest
votes
Your Answer
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "3"
};
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/3.0/"u003ecc by-sa 3.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%2fsuperuser.com%2fquestions%2f1405899%2fandroid-studio-seems-to-merge-my-branches-automatically%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
0
active
oldest
votes
0
active
oldest
votes
active
oldest
votes
active
oldest
votes
Thanks for contributing an answer to Super User!
- 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%2fsuperuser.com%2fquestions%2f1405899%2fandroid-studio-seems-to-merge-my-branches-automatically%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
