Questions tagged as 'merge'

Tagged questions
1
answer

I am not able to complete the merge this error always appears:

fatal: Exiting because of an unresolved conflict. U course-git-blog-project When I made the merge of a branch, it conflicted with the code that was in the master branch. I fix the code in hand, saved the index.html but I can not get out...
asked by 06.07.2018 / 00:19
2
answers

Problems with merge function

I'm having trouble with the merge function of nothingness, it stopped merging the data.frames. It seems like instead of using say cbind , it is using rbind and what is worse triple echo (each = 3). For two data.frames of 4...
asked by 13.02.2018 / 02:29
1
answer

What is the MERGE_MSG.swp file?

When running the merge command from my branch into another. The following alert occurred: According to the image description itself. The alert is displayed because the .MERGE_MSG.swp file is also being edited by another person o...
asked by 06.07.2017 / 15:00
0
answers

Merging Android Manifest.xml failed with AdMob [UNITY]

The error is present when I try to build in my Android game in Unity, it simply blames error and says that it was not possible to give Merge in the AndroidManifest.xml file. Error1    AndroidSDKToolsException: Unable to merge android manif...
asked by 29.04.2018 / 08:48
1
answer

Pull branch request outdated in Git

I created a branch from a repository in GitHub . I worked on this branch creating your own commits . The branch is in the remote repository. Meanwhile the master was evolving, developing code in master . In principle, the maste...
asked by 24.11.2017 / 00:17
2
answers

Look up values in one data.frame and add in another (R)

I have 2 data.frames, the first is a data.frame that contains stock data and a column with a unique identifier (column "ISIN") , as shown below: > Teste=data.frame(matrix(runif(20), nrow=5, ncol=4)) Teste$ISIN <- c("A1","A2","A3","A4","A5"...
asked by 19.04.2016 / 21:30
1
answer

Procedure pl / sql

Talk to the galley blz? Hi, I'm new to PL / SQL and I'm creating my first procedure because I need to load two tables (Insert or Change) I'm using Merge. But when I try to execute my procedure I already get the following error    PLS - 000103...
asked by 14.10.2015 / 17:30
1
answer

Join multiple mp3 files into a single mp3 file [closed]

Hello! I would like to create a program (in C language or another capable) that receives as input a text and returns me as output a song. For this I would need a text file (.txt) where I would need to read it and several audio files (.mp3) ea...
asked by 08.12.2016 / 21:05
1
answer

PHP array_merge multi-level. How to make?

I have the following array : $arrIni["ENV"]="US"; $arrIni["sap_db_server"] = "192.xxx.x.xx"; $arrIni["local_db_server"] = "localhost"; $arrIni["local_db_username"] = "root"; //Default settings...
asked by 09.05.2016 / 20:07
1
answer

Make a merge between multiple databases

I have a canteen system that performs sales in different schools. This system only works online, saving the sales movements in the array server (MS SQL). To optimize the system, I would like to work with it using a local base, so it would work e...
asked by 05.02.2016 / 12:50