Git integration For Magento2
.everyoneloves__top-leaderboard:empty,.everyoneloves__mid-leaderboard:empty,.everyoneloves__bot-mid-leaderboard:empty{ margin-bottom:0;
}
I committed my project files from one development member finely. When an another developer tried to pull files and push his changes to git. It is adding some code . For example bootstrap.php file the following <<<<
<<<<<<< HEAD
error_reporting(E_ALL);
ini_set('display_errors', 1);
=======
ini_set("display_errors", 1);
ini_set("track_errors", 1);
ini_set("html_errors", 1);
error_reporting(E_ALL);
>>>>>>> 8ee88031045329aa9e3793e7ee1352f9750118c1
How to remove these <<<<<
We are following below commands to commit files in git.
git init
git config --global user.email "myemail@gmail.com"
git remote add origin https://web.com/web.git
git config --global http.sslverify false
git push --set-upstream origin master
git pull --rebase
git pull https://web.com/web.git master
git pull origin master --allow-unrelated-histories
It is a private repo. What was wrong in these commands.? Please help me.
magento2 git github
asked 10 mins ago
DineshDinesh
10511
add a comment |
I committed my project files from one development member finely. When an another developer tried to pull files and push his changes to git. It is adding some code . For example bootstrap.php file the following <<<<
<<<<<<< HEAD
error_reporting(E_ALL);
ini_set('display_errors', 1);
=======
ini_set("display_errors", 1);
ini_set("track_errors", 1);
ini_set("html_errors", 1);
error_reporting(E_ALL);
>>>>>>> 8ee88031045329aa9e3793e7ee1352f9750118c1
How to remove these <<<<<
We are following below commands to commit files in git.
git init
git config --global user.email "myemail@gmail.com"
git remote add origin https://web.com/web.git
git config --global http.sslverify false
git push --set-upstream origin master
git pull --rebase
git pull https://web.com/web.git master
git pull origin master --allow-unrelated-histories
It is a private repo. What was wrong in these commands.? Please help me.
magento2 git github
asked 10 mins ago
DineshDinesh
10511
add a comment |
I committed my project files from one development member finely. When an another developer tried to pull files and push his changes to git. It is adding some code . For example bootstrap.php file the following <<<<
<<<<<<< HEAD
error_reporting(E_ALL);
ini_set('display_errors', 1);
=======
ini_set("display_errors", 1);
ini_set("track_errors", 1);
ini_set("html_errors", 1);
error_reporting(E_ALL);
>>>>>>> 8ee88031045329aa9e3793e7ee1352f9750118c1
How to remove these <<<<<
We are following below commands to commit files in git.
git init
git config --global user.email "myemail@gmail.com"
git remote add origin https://web.com/web.git
git config --global http.sslverify false
git push --set-upstream origin master
git pull --rebase
git pull https://web.com/web.git master
git pull origin master --allow-unrelated-histories
It is a private repo. What was wrong in these commands.? Please help me.
magento2 git github
asked 10 mins ago
DineshDinesh
10511
I committed my project files from one development member finely. When an another developer tried to pull files and push his changes to git. It is adding some code . For example bootstrap.php file the following <<<<
<<<<<<< HEAD
error_reporting(E_ALL);
ini_set('display_errors', 1);
=======
ini_set("display_errors", 1);
ini_set("track_errors", 1);
ini_set("html_errors", 1);
error_reporting(E_ALL);
>>>>>>> 8ee88031045329aa9e3793e7ee1352f9750118c1
How to remove these <<<<<
We are following below commands to commit files in git.
git init
git config --global user.email "myemail@gmail.com"
git remote add origin https://web.com/web.git
git config --global http.sslverify false
git push --set-upstream origin master
git pull --rebase
git pull https://web.com/web.git master
git pull origin master --allow-unrelated-histories
It is a private repo. What was wrong in these commands.? Please help me.
magento2 git github
magento2 git github
asked 10 mins ago
DineshDinesh
10511
asked 10 mins ago
DineshDinesh
10511
asked 10 mins ago
DineshDinesh
10511
asked 10 mins ago
DineshDinesh
10511
asked 10 mins ago
DineshDinesh
10511
10511
add a comment |
add a comment |
0
active
oldest
votes
Your Answer
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "479"
};
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: false,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: null,
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%2fmagento.stackexchange.com%2fquestions%2f270559%2fgit-integration-for-magento2%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 Magento Stack Exchange!
- 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%2fmagento.stackexchange.com%2fquestions%2f270559%2fgit-integration-for-magento2%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
