Your browser does not seem to support JavaScript. As a result, your viewing experience will be diminished, and you may not be able to execute some actions.

Please download a browser that supports JavaScript, or enable it if it's disabled (i.e. NoScript).

How to delete the computer files to turn them into another

Alberto last edited by

Is it possible to go back to the commite and do differently, or how to delete the files from the commite so that these files can be added to another comemite?
Reply Quote 0
1 Reply Last reply
N
Nykeriab last edited by
Yes, the old committ can be corrected as follows:
- create a branch on a refrigerated comme, stand on it.checkout -b)
- correct the code, pour the committ (but!) ammend last commit (sing) such switch to UI and command line
- All the old-fashioned committs moving after a correction to a new branch (rebase - to move once, or cherry-pick - One. I prefer one for the best. Conflict resolution. cherry-pick You can do the same from UI, the right button on the commite, and there's gonna be this option.
If you want to remove the files from him - at the code-coding stage - remove them from the commite - "hide" by the team. git stash save♪ ammend last commit To re-enact the current, cherry-pick to the proper comme you want the files and the team. git stash pop Get them out of the stash and lock them up properly.
Reply Quote 0
1 Reply Last reply

git 3930

2
Posts

0
Views

Suggested Topics

O

Is it possible to import "HTML file containing php containing another file" with file_get_contents?
Software Programming • php • • Oba22

2

0
Votes

2
Posts

0
Views

T

One way to run and load PHP files is to combine output buffering. Example template.php If you want to read, you can write as follows.$template = load_template(); function load_template() { // 出力バッファリングを開始 ob_start(); // ここで読み込むと通常は画面に表示されるが // ob_startしているので画面出力の代わりにバッファされている include 'template.php'; // バッファの中身を文字列として取り出し、バッファを破棄する return ob_get_clean(); } The files loaded with include are evaluated in the included variable scope. include predefined variables template.php can be referenced from template.php You can also see the variables defined in include. Therefore, I think that it is often not necessary to affect each other's variable by running in the function as above.More$_GET $_POST $_SERVER Superglobal and current directories are of course referenced at the time they include.These behaviors are useful for view templates, but if you want to run " exactly the same as when displaying in your browser", you may need to go through a web server as miyabi says.
N

How do you create a file in the file?
Software Programming • java • • nishika

2

0
Votes

2
Posts

0
Views

P

Like this:String pathToFile = "ПУТЬ_К_ВАШЕЙ_ПАПКЕ" + "YOURS_FILE_NAME.txt"; File file = new File(pathToFile); file.mkdirs(); try { // открываем поток для записи BufferedWriter bw = new BufferedWriter(new FileWriter(file)); // пишем данные bw.write("НЕКИЕ_СТРОКОВЫЕ_ДАННЫЕ"); // закрываем поток bw.close(); } catch (IOException e) { e.printStackTrace(); }
S

Git Extension Commands
Software Programming • git • • shizuka

2

0
Votes

2
Posts

0
Views

P

main git.cmainrun_argvhandle_builtin (Handling built-in commands)↑If you did not exit (if it was not processed as built-in command) execv_dashed_external (exec with external command with dash)"git-xxx" Assemb command name run_command_opt_v_opt in run-command.crun-command.c PATH Find and execute commands from execvp(3) Comment
O

Delete rows from a CSV file
Software Programming • php csv • • obi

2

0
Votes

2
Posts

0
Views

I have this function of an earlier project, maybe I can help you. It's a txt, but the functionality would be the same with a csvfunction borrar_fila(){ $DELETE = $_POST["delete"]; $data = file("archivo.txt"); $out = array(); foreach($data as $line) { if(trim($line) != $DELETE) { $out[] = $line; } } if (isset ($_POST["delete"])) //BOTON eliminar {borrar_fila();}
F

Pull request from outdated branch in Git
Software Programming • git github merge • • fbio

2

0
Votes

2
Posts

0
Views

S

At Github you can do one Pull Request of the branch mobile to the branch master.After this, this merge request will be available to be evaluated. If everything is right, just enter the request pull and approve (do the merge) the same in the master.If there are conflicts, you have two options: Doing merge of the branch master to the branch mobile, resolve conflicts and do so push from resolution to branch mobile. Pull Request will automatically detect that the conflict has been resolved and will allow merge.Doing merge manually (without using pull) branch mobile to the branch master. The resolution of the conflict will take place on the branch itself master.
C

Cleaning git in jenkins
Software Programming • git jenkins • • Cleofas

2

0
Votes

2
Posts

0
Views

There's been a nasty story with one of the winds, and it needs to be removed from the server client of the guita.If you've sent some secret data, like cryptographic keys, you'll consider them compromised and just replace them with new ones. Cleaning trails, you won't make the data safe again.How to remove all data First, we need to remove this branch in the repository from which Jenkins gets the code.git push origin :bad_branch Then, in Jenkins, add the next shell scrupt to the configuration and fulfil it once:# чтобы не упасть на следующей команде, если там нет ветки set +e # удаляем локальную ветку, если есть git branch -D bad_branch удаляем все tracking ветки, которых уже нет в удаленном репозитории среди них есть и наша вообще, я на 99% уверен, что Jenkins Git Plugin и так это делает git fetch --prune проверяем результат (потом читаем логи) git branch -r If you need a branch not even to be rebuilt after removal, you'll have to completely remove all references to the commites. It'll happen in a while, but let's assume you need it for some reason.Careful: You will lose the opportunity to restore any “loss”, i.e. not belonging to any existing branch of the comemite.It's got to be done in every car where you want to give a branch full of forget:# чистим reflog и запускаем сборщик мусора git reflog expire --expire=now --all && git gc --prune=now && git gc --aggressive --prune=now Now there are no commites and other objects from the unwanted branch, not only in history, but nowhere in the repository. There must still be something that can be rebuilt with physical access to the disk and related skills and tools.
Problems in creating -fatal branches: Not a valid object name: 'master'. ; bash: id: No such file or directory
Software Programming • git • • Marcee

2

0
Votes

2
Posts

0
Views

C

Branch names cannot contain spaces. Instead of doing git checkout -b nome da branch, do git checkout -b nome-da-branch. Also make sure you have an updated version of Git.
S

Filling in the file all the time computer work.
Software Programming • c sharp • • Saumya

2

0
Votes

2
Posts

0
Views

D

The console must work, the plague disappears after it has been activated, but the programme needs to be removed.Log runs every minute, time can be regulated in the timerusing System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; using System.Runtime.InteropServices; using System.Threading; namespace timer { class Program { [DllImport("kernel32.dll")] static extern IntPtr GetConsoleWindow(); [DllImport("user32.dll")] static extern bool ShowWindow(IntPtr hWnd, int nCmdShow); const int SW_HIDE = 0; const int SW_SHOW = 5; static private String _original_file; static private string _path; static void Main(string[] args) { var handle = GetConsoleWindow(); ShowWindow(handle, SW_HIDE); DateTime switchTime = DateTime.Now; _path = "D:\\client\\file.txt"; StreamReader readertext = new StreamReader(_path); _original_file = readertext.ReadToEnd(); readertext.Close(); StreamWriter writertext = new StreamWriter(_path); writertext.Write(_original_file); writertext.WriteLine("Был включен: " + switchTime); writertext.Close(); readertext = new StreamReader(_path); _original_file = readertext.ReadToEnd(); readertext.Close(); Timer t = new Timer(TimerCallback, null, 0, 60000); while (true) { } } public static void TimerCallback(object o) { using (var stream = new FileStream(_path, FileMode.Truncate)) { using (StreamWriter writertext = new StreamWriter(stream)) { writertext.Write(_original_file); writertext.WriteLine("Был изменен: " + DateTime.Now); } } } } }
When I write the git push origin master command I get this error
Software Programming • git github git push • • inna

2

0
Votes

2
Posts

0
Views

R

Someone's changed the branch. master from your remote server (the usual is because someone has created commits in the branch and pushed the changes).You have also made changes to the branch master, so there is a divergence between what is in remote and what is in local.In the error message it recommends that you download the changes in local, remove that dive and then try to push again.You can do that. git pull and then git push.When you do git pullon the one hand synchronize your branch origin/master with the branch master on the remote server. I'm talking about the branch. origin/masternot the branch master.Next thing you do git pull It's trying to put your branch on. master above your branch origin/master that is already synchronized in the previous step.This can be done by two strategies, you can try to merge your branchorigin/master over your branch master (default strategy) or you can try to put your branch master on your branch origin/master (rebase). The result will be the same as the state that the master branch will have at the end, but the structure of the tree will be different (usually the resulting tree is less complex if it is done over).Here, if everything goes well, the pull would be successful, but you may have a conflict if the areas of the files where there have been changes are close. This potential conflict can be solved by running git merge-tool and then adding the files you have modified in the resolution with git add. If you have no conflict, you don't have to do any of this.Once you've solved the possible conflict, you'd already have your branch. master in fast-forward relationship with the branch origin/master, that is, there is no divergence between the two branches and your master branch is above your origin/master branch, so you can already do git push.Although we are talking about conflicts, divergences, "someone has changed the branch master", you don't have to be alarmed, since this is the normal flow of work with other people with git, that message comes out simply because someone else has made changes to master before you, and now he just warns you to be careful not to crush the other person's work.
N

Can we re-establish the remote branch in the guitar if I already created a branch with the same name?
Software Programming • git git branch version control • • nishika

2

0
Votes

2
Posts

0
Views

A

The branch can be rebuilt, only in this situation, unfortunately, it will not help to change.The branch is a comet index. When you create a branch, it begins to point to the comet that made it.Since you didn't create new comets, but only you changed a local copy, there was no change, and the re-establishment of the branch would not help.
C

Keep the file in another directory.
Software Programming • c sharp files • • charlenef

2

0
Votes

2
Posts

0
Views

G

For example:File.Copy (path, outPath );
B

Modify the description of the merger
Software Programming • git git merge • • baileigh

2

0
Votes

2
Posts

0
Views

E

The easyst way to change the message of the previous committee:git commit --amend -m "текст"You can ban merge with automatic comedy through. --no-commit And then ask the text of the committ myself.git merge <branch A> --no-commit git commit -m "текст"
E

Switches at App.config and Web.config
Software Programming • c sharp git continuous integration • • esther

2

0
Votes

2
Posts

0
Views

In each of the projects, the app.config has an open connection line of the production database.Sounds dangerous. So, by giving the developer access to the repository, you trust him with access to the combat database. I think that access to combat infrastructure should be as limited as possible. So it's got to be removed from the repository.I suggest moving key connection parameters (e.g. logic and password or token, or whatever else might be) from the configuration to the variable environment.The usefulness of such an approach is very detailed in the manifest. https://12factor.net/ru/config Many CI serves can store such variables and initiate their environment before launching your application. That's right. https://docs.gitlab.com/ce/ci/variables/#secret-variables ♪ https://jenkins.io/doc/pipeline/tour/environment/ and https://docs.travis-ci.com/user/environment-variables/#Defining-Variables-in-Repository-Settings (References to the records of the pitches).Access to surveillance and editing of classified variables will be available to users with maximum access. If you don't light the variables in the bow of the assembly, they won't be available in random traffic. Just don't duplicate the team to connect to the database.It will also be necessary to build secret variables to be used only when the code is decorated from your release line.The programmer will initiate the environment itself, you can write some kind of crypt to help him.
R

Specific commit Merge
Software Programming • git git c languageherry pic l • • Rossere

2

0
Votes

2
Posts

0
Views

O

Cherry PickingEach commit in a repository corresponds to a tree full of files. Typically, these files were created over multiple commits. But sometimes it is necessary to take the delta between two commits, and apply it to a different branch, as in your case.In this case, you do not want to take the current state of the tree (which may have unfinished or untested changes); you just want to catch the delta associated with this change.In other version control systems, you would just have to create a diff based on the latest change, and then fix the change in your launch branch. Instead, with Git, we can use the command https://git-scm.com/docs/git-cherry-pick to do the work for us:git checkout master echo Working >> file.txt git commit -m "Working" file.txt echo BugFix >> bugfix.txt git commit -m "BugFix" bugfix.txt echo More Working >> file.txt git commit -m "More working" file.txt # Vamos aplicar o 'bugfix' para release git checkout release10 git cherry-pick master~1 [release10 41037ab] BugFix 0 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 bugfix.txt This allowed us to make a single change - described here with master~1 - and copy the delta on the launch branch.If we had several changes, we could have master~3. master~1. Unlike just generating a diff and current tree patch, this will copy the commits (and your relationships) over the new branch. OriginFinally, it is interesting to note that when you copy a change using this mechanism, the commit hash will change (notably because it will have a different hierarchy). Sometimes it doesn't matter, but if you want to record where the original change came, you can perform cherry-pick-x git. This inserts a commit message indicating where the original change came from:git checkout release10 git cherry-pick -x master~1 git cherry-pick master~1 [release10 41037ab] BugFix (cherry picked from commit 938a4c0bbb3985524192aa8a926ea6757263e94b) 0 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 bugfix.txt You can also make the cherry-pick from the commit SHA, just make the commit you want to bring to your branch and run with the command:git cherry-pick -x b53af978b3581509557c6e24923edf1c8a683e02 Creating a new historyWhenever you're using cherry-pick, especially if you're reordering commits, you're creating a new history. However, you never really throw out the old one, everything is available from the reflogs. You are not destroying history, you are creating other alternatives. The whole cherry picking gives you the ability to apply patches of other branches in a safe way and with fewer errors.
S

Recognize .INI / Redo .INI File in case of deletion of the file
Software Programming • delphi • • Saumya

2

0
Votes

2
Posts

0
Views

E

I did it this way and it worked:var arquivo : TIniFile; existeArquivo : BOOL; begin if not DirectoryExists('C:\sga') then begin if not CreateDir('C:\sga') then begin ShowMessage('Erro ao tentar criar o diretório!'); end; end; existeArquivo := True; // Verifica se existe o arquivo if not FileExists('C:\sga\saga.ini') then existeArquivo := False; arquivo := TIniFile.Create('C:\sga\saga.ini'); // Gravar valores if not existeArquivo then begin arquivo.WriteString('BASEDADOS', 'PathSec', 'PathSecTestes'); arquivo.WriteString('BASEDADOS', 'Base', 'BaseTestes'); arquivo.WriteString('BASEDADOS', 'Chave', 'ChaveTestes'); end; // Lendo valores Edit1.Text := arquivo.ReadString('BASEDADOS', 'PathSec', '');

How to delete the computer files to turn them into another

Suggested Topics

Is it possible to import "HTML file containing php containing another file" with file_get_contents? Software Programming • php • • Oba22

How do you create a file in the file? Software Programming • java • • nishika

Git Extension Commands Software Programming • git • • shizuka

Delete rows from a CSV file Software Programming • php csv • • obi

Pull request from outdated branch in Git Software Programming • git github merge • • fbio

Cleaning git in jenkins Software Programming • git jenkins • • Cleofas

Problems in creating -fatal branches: Not a valid object name: 'master'. ; bash: id: No such file or directory Software Programming • git • • Marcee

Filling in the file all the time computer work. Software Programming • c sharp • • Saumya

When I write the git push origin master command I get this error Software Programming • git github git push • • inna

Can we re-establish the remote branch in the guitar if I already created a branch with the same name? Software Programming • git git branch version control • • nishika

Keep the file in another directory. Software Programming • c sharp files • • charlenef

Modify the description of the merger Software Programming • git git merge • • baileigh

Switches at App.config and Web.config Software Programming • c sharp git continuous integration • • esther

Specific commit Merge Software Programming • git git c languageherry pic l • • Rossere

Recognize .INI / Redo .INI File in case of deletion of the file Software Programming • delphi • • Saumya

Is it possible to import "HTML file containing php containing another file" with file_get_contents?
Software Programming • php • • Oba22

How do you create a file in the file?
Software Programming • java • • nishika

Git Extension Commands
Software Programming • git • • shizuka

Delete rows from a CSV file
Software Programming • php csv • • obi

Pull request from outdated branch in Git
Software Programming • git github merge • • fbio

Cleaning git in jenkins
Software Programming • git jenkins • • Cleofas

Problems in creating -fatal branches: Not a valid object name: 'master'. ; bash: id: No such file or directory
Software Programming • git • • Marcee

Filling in the file all the time computer work.
Software Programming • c sharp • • Saumya

When I write the git push origin master command I get this error
Software Programming • git github git push • • inna

Can we re-establish the remote branch in the guitar if I already created a branch with the same name?
Software Programming • git git branch version control • • nishika

Keep the file in another directory.
Software Programming • c sharp files • • charlenef

Modify the description of the merger
Software Programming • git git merge • • baileigh

Switches at App.config and Web.config
Software Programming • c sharp git continuous integration • • esther

Specific commit Merge
Software Programming • git git c languageherry pic l • • Rossere

Recognize .INI / Redo .INI File in case of deletion of the file
Software Programming • delphi • • Saumya